patch-2.4.0-test9 linux/drivers/block/loop.c

• Lines: 17
• Date: Tue Sep 19 08:31:35 2000
• Orig file: v2.4.0-test8/linux/drivers/block/loop.c
• Orig date: Tue Sep 5 14:07:30 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/block/loop.c linux/drivers/block/loop.c
@@ -584,6 +584,8 @@
 	type = info.lo_encrypt_type; 
 	if (type >= MAX_LO_CRYPT || xfer_funcs[type] == NULL)
 		return -EINVAL;
+	if (type == LO_CRYPT_XOR && info.lo_encrypt_key_size == 0)
+		return -EINVAL;
 	err = loop_release_xfer(lo);
 	if (!err) 
 		err = loop_init_xfer(lo, type, &info);
@@ -793,7 +795,6 @@
 		max_loop = 8;
 	}
 
-	printk(KERN_INFO "loop: registered device at major %d\n", MAJOR_NR);
 	printk(KERN_INFO "loop: enabling %d loop devices\n", max_loop);
 
 	loop_dev = kmalloc (max_loop * sizeof(struct loop_device), GFP_KERNEL);