patch-2.1.100 linux/drivers/scsi/sd_ioctl.c

• Lines: 26
• Date: Wed May 6 10:56:08 1998
• Orig file: v2.1.99/linux/drivers/scsi/sd_ioctl.c
• Orig date: Sun Jan 4 10:40:16 1998

diff -u --recursive --new-file v2.1.99/linux/drivers/scsi/sd_ioctl.c linux/drivers/scsi/sd_ioctl.c
@@ -79,7 +79,7 @@
 	return 0;
 
     case BLKRASET:
-	if (!suser())
+	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
 	if(!(inode->i_rdev)) return -EINVAL;
 	if(arg > 0xff) return -EINVAL;
@@ -96,13 +96,15 @@
 	return 0;
 
     case BLKFLSBUF:
-	if(!suser())  return -EACCES;
+	if(!capable(CAP_SYS_ADMIN))  return -EACCES;
 	if(!(inode->i_rdev)) return -EINVAL;
 	fsync_dev(inode->i_rdev);
 	invalidate_buffers(inode->i_rdev);
 	return 0;
 	
     case BLKRRPART: /* Re-read partition tables */
+        if (!capable(CAP_SYS_ADMIN))
+                return -EACCES;
 	return revalidate_scsidisk(dev, 1);
 
     RO_IOCTLS(dev, arg);