patch-2.1.4 linux/drivers/block/loop.c

Next file: linux/drivers/block/rd.c
Previous file: linux/drivers/block/ide.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/drivers/block/loop.c linux/drivers/block/loop.c
@@ -349,7 +349,7 @@
 	err = verify_area(VERIFY_READ, arg, sizeof(info));
 	if (err)
 		return err;
-	memcpy_fromfs(&info, arg, sizeof(info));
+	copy_from_user(&info, arg, sizeof(info));
 	if ((unsigned int) info.lo_encrypt_key_size > LO_KEY_SIZE)
 		return -EINVAL;
 	switch (info.lo_encrypt_type) {
@@ -423,7 +423,7 @@
 		memcpy(info.lo_encrypt_key, lo->lo_encrypt_key,
 		       lo->lo_encrypt_key_size);
 	}
-	memcpy_tofs(arg, &info, sizeof(info));
+	copy_to_user(arg, &info, sizeof(info));
 	return 0;
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov