Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

microblaze: Fix /dev/zero corruption from __clear_user()

A userland read of more than PAGE_SIZE bytes from /dev/zero results in
(a) not all of the bytes returned being zero, and
(b) memory corruption due to zeroing of bytes beyond the user buffer.

This is caused by improper constraints on the assembly __clear_user function.
The constrints don't indicate to the compiler that the pointer argument is
modified. Since the function is inline, this results in double-incrementing
of the pointer when __clear_user() is invoked through a multi-page read() of
/dev/zero.

Signed-off-by: Steven J. Magnani <steve@digidescorp.com>
Acked-by: Michal Simek <monstr@monstr.eu>
CC: stable@kernel.org

authored by

Steven J. Magnani and committed by
Michal Simek
6f3946b4 6f205a4c

+4 -4
+4 -4
arch/microblaze/include/asm/uaccess.h
··· 120 120 { 121 121 /* normal memset with two words to __ex_table */ 122 122 __asm__ __volatile__ ( \ 123 - "1: sb r0, %2, r0;" \ 123 + "1: sb r0, %1, r0;" \ 124 124 " addik %0, %0, -1;" \ 125 125 " bneid %0, 1b;" \ 126 - " addik %2, %2, 1;" \ 126 + " addik %1, %1, 1;" \ 127 127 "2: " \ 128 128 __EX_TABLE_SECTION \ 129 129 ".word 1b,2b;" \ 130 130 ".previous;" \ 131 - : "=r"(n) \ 132 - : "0"(n), "r"(to) 131 + : "=r"(n), "=r"(to) \ 132 + : "0"(n), "1"(to) 133 133 ); 134 134 return n; 135 135 }