patch-2.0.34 linux/drivers/scsi/sg.c

• Lines: 22
• Date: Wed Jun 3 15:17:49 1998
• Orig file: v2.0.33/linux/drivers/scsi/sg.c
• Orig date: Sat Aug 31 23:15:33 1996

diff -u --recursive --new-file v2.0.33/linux/drivers/scsi/sg.c linux/drivers/scsi/sg.c
@@ -73,13 +73,20 @@
     switch(cmd_in)
     {
     case SG_SET_TIMEOUT:
-        result = verify_area(VERIFY_READ, (const void *)arg, sizeof(long));
+        result = verify_area(VERIFY_READ, (const void *)arg, sizeof(int));
         if (result) return result;
 
 	scsi_generics[dev].timeout=get_user((int *) arg);
 	return 0;
     case SG_GET_TIMEOUT:
 	return scsi_generics[dev].timeout;
+    case SCSI_IOCTL_SEND_COMMAND:
+	/*
+	  Allow SCSI_IOCTL_SEND_COMMAND without checking suser() since the
+	  user already has read/write access to the generic device and so
+	  can execute arbitrary SCSI commands.
+	*/
+	return scsi_ioctl_send_command(scsi_generics[dev].device, (void *) arg);
     default:
 	return scsi_ioctl(scsi_generics[dev].device, cmd_in, (void *) arg);
     }