From: James Hogan <james.hogan@imgtec.com>
To: <linux-kernel@vger.kernel.org>
Cc: <linux-arch@vger.kernel.org>, <linux-mips@linux-mips.org>,
James Hogan <james.hogan@imgtec.com>,
Kees Cook <keescook@chromium.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 5/7] test_user_copy: Check __copy_{to,from}_user_inatomic()
Date: Wed, 5 Aug 2015 16:48:53 +0100 [thread overview]
Message-ID: <1438789735-4643-6-git-send-email-james.hogan@imgtec.com> (raw)
In-Reply-To: <1438789735-4643-1-git-send-email-james.hogan@imgtec.com>
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
next prev parent reply other threads:[~2015-08-05 15:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 15:48 [PATCH 0/7] test_user_copy improvements James Hogan
2015-08-05 15:48 ` [PATCH 1/7] test_user_copy: Check legit kernel accesses James Hogan
2015-08-05 15:48 ` [PATCH 2/7] test_user_copy: Check unchecked accessors James Hogan
2015-08-05 15:48 ` [PATCH 3/7] test_user_copy: Check __clear_user()/clear_user() James Hogan
2015-08-05 15:48 ` [PATCH 4/7] test_user_copy: Check __copy_in_user()/copy_in_user() James Hogan
2015-08-05 15:48 ` James Hogan [this message]
2015-08-05 15:48 ` [PATCH 6/7] test_user_copy: Check user string accessors James Hogan
2015-08-05 15:48 ` [PATCH 7/7] test_user_copy: Check user checksum functions James Hogan
2015-08-05 20:26 ` [PATCH 0/7] test_user_copy improvements Kees Cook
2015-08-06 16:28 ` James Hogan
2015-08-06 9:50 ` Guenter Roeck
2015-08-06 10:01 ` James Hogan
2015-08-06 15:02 ` James Hogan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438789735-4643-6-git-send-email-james.hogan@imgtec.com \
--to=james.hogan@imgtec.com \
--cc=akpm@linux-foundation.org \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®