Merge branch 'work.fdpic' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / misc / lkdtm / usercopy.c

diff --git a/drivers/misc/lkdtm/usercopy.c b/drivers/misc/lkdtm/usercopy.c
index e172719..b833367 100644 (file)
--- a/drivers/misc/lkdtm/usercopy.c
+++ b/drivers/misc/lkdtm/usercopy.c
@@ -304,19 +304,22 @@ void lkdtm_USERCOPY_KERNEL(void)
                return;
        }
 
-       pr_info("attempting good copy_to_user from kernel rodata\n");
+       pr_info("attempting good copy_to_user from kernel rodata: %px\n",
+               test_text);
        if (copy_to_user((void __user *)user_addr, test_text,
                         unconst + sizeof(test_text))) {
                pr_warn("copy_to_user failed unexpectedly?!\n");
                goto free_user;
        }
 
-       pr_info("attempting bad copy_to_user from kernel text\n");
+       pr_info("attempting bad copy_to_user from kernel text: %px\n",
+               vm_mmap);
        if (copy_to_user((void __user *)user_addr, vm_mmap,
                         unconst + PAGE_SIZE)) {
                pr_warn("copy_to_user failed, but lacked Oops\n");
                goto free_user;
        }
+       pr_err("FAIL: survived bad copy_to_user()\n");
 
 free_user:
        vm_munmap(user_addr, PAGE_SIZE);