Revert "lib/test_user_copy.c: check user checksum functions"

This reverts commit 0b6e2917b6fcf29e15ad42a60ecb9cd29b64534c.

1 files changed, 0 insertions, 50 deletions

diff --git a/lib/test_user_copy.c b/lib/test_user_copy.c
index 76e0c1c25cd2..6d05ec5f6cfa 100644
--- a/lib/test_user_copy.c
+++ b/lib/test_user_copy.c
@@ -24,7 +24,6 @@
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <linux/vmalloc.h>
-#include <net/checksum.h>
 
 #define test(condition, msg)		\
 ({					\
@@ -42,7 +41,6 @@ static int __init test_user_copy_init(void)
 	char *bad_usermem;
 	unsigned long user_addr;
 	unsigned long value = 0x5A;
-	int err;
 	mm_segment_t fs = get_fs();
 
 	kmem = kmalloc(PAGE_SIZE * 2, GFP_KERNEL);
@@ -80,12 +78,6 @@ static int __init test_user_copy_init(void)
 		    "legitimate strnlen_user failed");
 	ret |= test(strlen_user(usermem) == 0,
 		    "legitimate strlen_user failed");
-	err = 0;
-	csum_and_copy_from_user(usermem, kmem, PAGE_SIZE, 0, &err);
-	ret |= test(err, "legitimate csum_and_copy_from_user failed");
-	err = 0;
-	csum_and_copy_to_user(kmem, usermem, PAGE_SIZE, 0, &err);
-	ret |= test(err, "legitimate csum_and_copy_to_user failed");
 
 	ret |= test(!access_ok(VERIFY_READ, usermem, PAGE_SIZE * 2),
 		    "legitimate access_ok VERIFY_READ failed");
@@ -107,9 +99,6 @@ static int __init test_user_copy_init(void)
 		    "legitimate __put_user failed");
 	ret |= test(__clear_user(usermem, PAGE_SIZE) != 0,
 		    "legitimate __clear_user passed");
-	err = 0;
-	csum_partial_copy_from_user(usermem, kmem, PAGE_SIZE, 0, &err);
-	ret |= test(err, "legitimate csum_partial_copy_from_user failed");
 
 	/* Invalid usage: none of these should succeed. */
 	ret |= test(!copy_from_user(kmem, (char __user *)(kmem + PAGE_SIZE),
@@ -149,22 +138,6 @@ static int __init test_user_copy_init(void)
 		    "illegal strnlen_user passed");
 	ret |= test(strlen_user((char __user *)kmem) != 0,
 		    "illegal strlen_user passed");
-	err = 0;
-	csum_and_copy_from_user((char __user *)(kmem + PAGE_SIZE), kmem,
-				PAGE_SIZE, 0, &err);
-	ret |= test(!err, "illegal all-kernel csum_and_copy_from_user passed");
-	err = 0;
-	csum_and_copy_from_user((char __user *)kmem, bad_usermem,
-				PAGE_SIZE, 0, &err);
-	ret |= test(!err, "illegal reversed csum_and_copy_from_user passed");
-	err = 0;
-	csum_and_copy_to_user(kmem, (char __user *)(kmem + PAGE_SIZE),
-			      PAGE_SIZE, 0, &err);
-	ret |= test(!err, "illegal all-kernel csum_and_copy_to_user passed");
-	err = 0;
-	csum_and_copy_to_user(bad_usermem, (char __user *)kmem, PAGE_SIZE, 0,
-			      &err);
-	ret |= test(!err, "illegal reversed csum_and_copy_to_user passed");
 
 	/*
 	 * If unchecked user accesses (__*) on this architecture cannot access
@@ -219,16 +192,6 @@ static int __init test_user_copy_init(void)
 		    "illegal __put_user passed");
 	ret |= test(__clear_user((char __user *)kmem, PAGE_SIZE) != PAGE_SIZE,
 		    "illegal kernel __clear_user passed");
-	err = 0;
-	csum_partial_copy_from_user((char __user *)(kmem + PAGE_SIZE), kmem,
-				    PAGE_SIZE, 0, &err);
-	ret |= test(!err,
-		    "illegal all-kernel csum_partial_copy_from_user passed");
-	err = 0;
-	csum_partial_copy_from_user((char __user *)kmem, bad_usermem, PAGE_SIZE,
-				    0, &err);
-	ret |= test(!err,
-		    "illegal reversed csum_partial_copy_from_user passed");
 #endif
 
 	/*
@@ -261,14 +224,6 @@ static int __init test_user_copy_init(void)
 		    "legitimate kernel strnlen_user failed");
 	ret |= test(strlen_user((char __user *)kmem) == 0,
 		    "legitimate kernel strlen_user failed");
-	err = 0;
-	csum_and_copy_from_user((char __user *)(kmem + PAGE_SIZE), kmem,
-				PAGE_SIZE, 0, &err);
-	ret |= test(err, "legitimate kernel csum_and_copy_from_user failed");
-	err = 0;
-	csum_and_copy_to_user(kmem, (char __user *)(kmem + PAGE_SIZE),
-			      PAGE_SIZE, 0, &err);
-	ret |= test(err, "legitimate kernel csum_and_copy_to_user failed");
 
 	ret |= test(!access_ok(VERIFY_READ, (char __user *)kmem, PAGE_SIZE * 2),
 		    "legitimate kernel access_ok VERIFY_READ failed");
@@ -298,11 +253,6 @@ static int __init test_user_copy_init(void)
 		    "legitimate kernel __put_user failed");
 	ret |= test(__clear_user((char __user *)kmem, PAGE_SIZE) != 0,
 		    "legitimate kernel __clear_user failed");
-	err = 0;
-	csum_partial_copy_from_user((char __user *)(kmem + PAGE_SIZE), kmem,
-				    PAGE_SIZE, 0, &err);
-	ret |= test(err,
-		    "legitimate kernel csum_partial_copy_from_user failed");
 
 	/* Restore previous address limit. */
 	set_fs(fs);