* [PATCH] test: fix sparse warnings in user_copy tests
@ 2013-12-06 18:57 Kees Cook
0 siblings, 0 replies; only message in thread
From: Kees Cook @ 2013-12-06 18:57 UTC (permalink / raw
To: Andrew Morton; +Cc: linux-kernel
Sparse fix for "test: check copy_to/from_user boundary validation":
To keep sparse happy with the horrible things being done with the user
memory pointers, declare both __user and non-__user cases ahead of time
to avoid needing to do the casts later.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
lib/test_user_copy.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/test_user_copy.c b/lib/test_user_copy.c
index b61f3e406e0b..0ecef3e4690e 100644
--- a/lib/test_user_copy.c
+++ b/lib/test_user_copy.c
@@ -38,6 +38,7 @@ static int __init test_user_copy_init(void)
int ret = 0;
char *kmem;
char __user *usermem;
+ char *bad_usermem;
unsigned long user_addr;
unsigned long value = 0x5A;
@@ -55,6 +56,7 @@ static int __init test_user_copy_init(void)
}
usermem = (char __user *)user_addr;
+ bad_usermem = (char *)user_addr;
/* Legitimate usage: none of these should fail. */
ret |= test(copy_from_user(kmem, usermem, PAGE_SIZE),
@@ -70,13 +72,13 @@ static int __init test_user_copy_init(void)
ret |= test(!copy_from_user(kmem, (char __user *)(kmem + PAGE_SIZE),
PAGE_SIZE),
"illegal all-kernel copy_from_user passed");
- ret |= test(!copy_from_user((char *)usermem, (char __user *)kmem,
+ ret |= test(!copy_from_user(bad_usermem, (char __user *)kmem,
PAGE_SIZE),
"illegal reversed copy_from_user 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, (char *)usermem,
+ ret |= test(!copy_to_user((char __user *)kmem, bad_usermem,
PAGE_SIZE),
"illegal reversed copy_to_user passed");
ret |= test(!get_user(value, (unsigned long __user *)kmem),
--
1.7.9.5
--
Kees Cook
Chrome OS Security
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-12-06 18:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-06 18:57 [PATCH] test: fix sparse warnings in user_copy tests Kees Cook
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.