diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-11-18 12:47:13 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-11-19 12:22:08 -0500 |
| commit | 640465bda58c7078725201be7430c31a349121e9 (patch) | |
| tree | d3e9804280f58cbe7638358c519c238b50325e6e /arch/mips | |
| parent | 51b1029d9966060c6ad02030e6f251425b4f06c1 (diff) | |
MIPS: Zero variable read by get_user / __get_user in case of an error.
This wasn't happening in all cases.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/include/asm/uaccess.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h index b9ab717e3619..133678ab4eb8 100644 --- a/arch/mips/include/asm/uaccess.h +++ b/arch/mips/include/asm/uaccess.h | |||
| @@ -301,7 +301,8 @@ do { \ | |||
| 301 | __get_kernel_common((x), size, __gu_ptr); \ | 301 | __get_kernel_common((x), size, __gu_ptr); \ |
| 302 | else \ | 302 | else \ |
| 303 | __get_user_common((x), size, __gu_ptr); \ | 303 | __get_user_common((x), size, __gu_ptr); \ |
| 304 | } \ | 304 | } else \ |
| 305 | (x) = 0; \ | ||
| 305 | \ | 306 | \ |
| 306 | __gu_err; \ | 307 | __gu_err; \ |
| 307 | }) | 308 | }) |
| @@ -316,6 +317,7 @@ do { \ | |||
| 316 | " .insn \n" \ | 317 | " .insn \n" \ |
| 317 | " .section .fixup,\"ax\" \n" \ | 318 | " .section .fixup,\"ax\" \n" \ |
| 318 | "3: li %0, %4 \n" \ | 319 | "3: li %0, %4 \n" \ |
| 320 | " move %1, $0 \n" \ | ||
| 319 | " j 2b \n" \ | 321 | " j 2b \n" \ |
| 320 | " .previous \n" \ | 322 | " .previous \n" \ |
| 321 | " .section __ex_table,\"a\" \n" \ | 323 | " .section __ex_table,\"a\" \n" \ |
| @@ -630,6 +632,7 @@ do { \ | |||
| 630 | " .insn \n" \ | 632 | " .insn \n" \ |
| 631 | " .section .fixup,\"ax\" \n" \ | 633 | " .section .fixup,\"ax\" \n" \ |
| 632 | "3: li %0, %4 \n" \ | 634 | "3: li %0, %4 \n" \ |
| 635 | " move %1, $0 \n" \ | ||
| 633 | " j 2b \n" \ | 636 | " j 2b \n" \ |
| 634 | " .previous \n" \ | 637 | " .previous \n" \ |
| 635 | " .section __ex_table,\"a\" \n" \ | 638 | " .section __ex_table,\"a\" \n" \ |