patch-2.1.100 linux/drivers/block/ps2esdi.c

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

diff -u --recursive --new-file v2.1.99/linux/drivers/block/ps2esdi.c linux/drivers/block/ps2esdi.c
@@ -1091,7 +1091,7 @@
 			}
 			break;
 		case BLKRASET:
-			if (!suser())
+			if (!capable(CAP_SYS_ADMIN))
 				return -EACCES;
 			if (!inode->i_rdev)
 				return -EINVAL;
@@ -1109,7 +1109,7 @@
 			}
 			break;
 		case BLKFLSBUF:
-			if (!suser())
+			if (!capable(CAP_SYS_ADMIN))
 				return -EACCES;
 			if (!inode->i_rdev)
 				return -EINVAL;
@@ -1118,6 +1118,8 @@
 			return 0;
 
 		case BLKRRPART:
+                        if (!capable(CAP_SYS_ADMIN)) 
+				return -EACCES;
 			return (ps2esdi_reread_partitions(inode->i_rdev));
 			RO_IOCTLS(inode->i_rdev, arg);
 		}

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