diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-11 14:53:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-11 15:42:59 -0400 |
commit | 1d18ef489509314506328b9e464dd47c24c1d68f (patch) | |
tree | 0462ee876e127f9b86afa05e48cfc50d0163cbd4 /arch/x86 | |
parent | 3ee1afa308f2a38e5d1e2ad3752ad7abcf480da1 (diff) |
x86: some lock annotations for user copy paths, v3
- add annotation back to clear_user()
- change probe_kernel_address() to _inatomic*() method
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/lib/usercopy_32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c index 7393152a252e..fab5faba1d3e 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c | |||
@@ -148,6 +148,7 @@ do { \ | |||
148 | unsigned long | 148 | unsigned long |
149 | clear_user(void __user *to, unsigned long n) | 149 | clear_user(void __user *to, unsigned long n) |
150 | { | 150 | { |
151 | might_fault(); | ||
151 | if (access_ok(VERIFY_WRITE, to, n)) | 152 | if (access_ok(VERIFY_WRITE, to, n)) |
152 | __do_clear_user(to, n); | 153 | __do_clear_user(to, n); |
153 | return n; | 154 | return n; |