Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1200937
| From | James Hogan <james.hogan@imgtec.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 5/7] test_user_copy: Check __copy_{to,from}_user_inatomic() |
| Date | 2015-08-05 18:00 +0200 |
| Message-ID | <pU9gL-5S2-27@gated-at.bofh.it> (permalink) |
| References | <pU974-5Ga-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Add basic success/failure checking of __copy_to_user_inatomic() and __copy_from_user_inatomic(). For testing purposes these are similar to their non-atomic non-checking friends, so the new tests match those for __copy_to_user() and __copy_from_user(). New tests: - legitimate __copy_from_user_inatomic - legitimate __copy_to_user_inatomic - illegal all-kernel __copy_from_user_inatomic - illegal reversed __copy_from_user_inatomic - illegal all-kernel __copy_to_user_inatomic - illegal reversed __copy_to_user_inatomic - legitimate all-kernel __copy_from_user_inatomic - legitimate all-kernel __copy_to_user_inatomic Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Kees Cook <keescook@chromium.org> Cc: Andrew Morton <akpm@linux-foundation.org> --- lib/test_user_copy.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/test_user_copy.c b/lib/test_user_copy.c index 310e796beef6..6cbdb0a15ca2 100644 --- a/lib/test_user_copy.c +++ b/lib/test_user_copy.c @@ -79,8 +79,12 @@ static int __init test_user_copy_init(void) "legitimate access_ok VERIFY_WRITE failed"); ret |= test(__copy_from_user(kmem, usermem, PAGE_SIZE), "legitimate __copy_from_user failed"); + ret |= test(__copy_from_user_inatomic(kmem, usermem, PAGE_SIZE), + "legitimate __copy_from_user_inatomic failed"); ret |= test(__copy_to_user(usermem, kmem, PAGE_SIZE), "legitimate __copy_to_user failed"); + ret |= test(__copy_to_user_inatomic(usermem, kmem, PAGE_SIZE), + "legitimate __copy_to_user_inatomic failed"); ret |= test(__copy_in_user(usermem, usermem + PAGE_SIZE, PAGE_SIZE), "legitimate __copy_in_user failed"); ret |= test(__get_user(value, (unsigned long __user *)usermem), @@ -137,12 +141,25 @@ static int __init test_user_copy_init(void) ret |= test(!__copy_from_user(bad_usermem, (char __user *)kmem, PAGE_SIZE), "illegal reversed __copy_from_user passed"); + ret |= test(!__copy_from_user_inatomic(kmem, + (char __user *)(kmem + PAGE_SIZE), + PAGE_SIZE), + "illegal all-kernel __copy_from_user_inatomic passed"); + ret |= test(!__copy_from_user_inatomic(bad_usermem, (char __user *)kmem, + PAGE_SIZE), + "illegal reversed __copy_from_user_inatomic passed"); ret |= test(!__copy_to_user((char __user *)kmem, kmem + PAGE_SIZE, PAGE_SIZE), "illegal all-kernel __copy_to_user passed"); ret |= test(!__copy_to_user((char __user *)kmem, bad_usermem, PAGE_SIZE), "illegal reversed __copy_to_user passed"); + ret |= test(!__copy_to_user_inatomic((char __user *)kmem, + kmem + PAGE_SIZE, PAGE_SIZE), + "illegal all-kernel __copy_to_user_inatomic passed"); + ret |= test(!__copy_to_user_inatomic((char __user *)kmem, bad_usermem, + PAGE_SIZE), + "illegal reversed __copy_to_user_inatomic passed"); ret |= test(!__copy_in_user((char __user *)kmem, (char __user *)(kmem + PAGE_SIZE), PAGE_SIZE), @@ -193,9 +210,16 @@ static int __init test_user_copy_init(void) ret |= test(__copy_from_user(kmem, (char __user *)(kmem + PAGE_SIZE), PAGE_SIZE), "legitimate all-kernel __copy_from_user failed"); + ret |= test(__copy_from_user_inatomic(kmem, + (char __user *)(kmem + PAGE_SIZE), + PAGE_SIZE), + "legitimate all-kernel __copy_from_user_inatomic failed"); ret |= test(__copy_to_user((char __user *)kmem, kmem + PAGE_SIZE, PAGE_SIZE), "legitimate all-kernel __copy_to_user failed"); + ret |= test(__copy_to_user_inatomic((char __user *)kmem, + kmem + PAGE_SIZE, PAGE_SIZE), + "legitimate all-kernel __copy_to_user_inatomic failed"); ret |= test(__copy_in_user((char __user *)kmem, (char __user *)(kmem + PAGE_SIZE), PAGE_SIZE), -- 2.3.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/7] test_user_copy improvements James Hogan <james.hogan@imgtec.com> - 2015-08-05 17:50 +0200
[PATCH 7/7] test_user_copy: Check user checksum functions James Hogan <james.hogan@imgtec.com> - 2015-08-05 17:50 +0200
[PATCH 2/7] test_user_copy: Check unchecked accessors James Hogan <james.hogan@imgtec.com> - 2015-08-05 17:50 +0200
[PATCH 3/7] test_user_copy: Check __clear_user()/clear_user() James Hogan <james.hogan@imgtec.com> - 2015-08-05 18:00 +0200
[PATCH 1/7] test_user_copy: Check legit kernel accesses James Hogan <james.hogan@imgtec.com> - 2015-08-05 18:00 +0200
[PATCH 6/7] test_user_copy: Check user string accessors James Hogan <james.hogan@imgtec.com> - 2015-08-05 18:00 +0200
[PATCH 4/7] test_user_copy: Check __copy_in_user()/copy_in_user() James Hogan <james.hogan@imgtec.com> - 2015-08-05 18:00 +0200
[PATCH 5/7] test_user_copy: Check __copy_{to,from}_user_inatomic() James Hogan <james.hogan@imgtec.com> - 2015-08-05 18:00 +0200
Re: [PATCH 0/7] test_user_copy improvements Kees Cook <keescook@chromium.org> - 2015-08-05 22:30 +0200
Re: [PATCH 0/7] test_user_copy improvements James Hogan <james.hogan@imgtec.com> - 2015-08-06 18:30 +0200
Re: [PATCH 0/7] test_user_copy improvements Guenter Roeck <linux@roeck-us.net> - 2015-08-06 12:00 +0200
Re: [PATCH 0/7] test_user_copy improvements James Hogan <james.hogan@imgtec.com> - 2015-08-06 12:10 +0200
Re: [PATCH 0/7] test_user_copy improvements James Hogan <james.hogan@imgtec.com> - 2015-08-06 17:10 +0200
csiph-web