patch-2.3.10 linux/fs/ioctl.c

• Lines: 32
• Date: Mon Jul 5 20:33:16 1999
• Orig file: v2.3.9/linux/fs/ioctl.c
• Orig date: Wed Jun 30 13:38:20 1999

diff -u --recursive --new-file v2.3.9/linux/fs/ioctl.c linux/fs/ioctl.c
@@ -25,6 +25,8 @@
 				return -EBADF;
 		    	if (inode->i_op->get_block == NULL)
 				return -EINVAL;
+			if (!capable(CAP_SYS_RAWIO))
+				return -EPERM;
 			if ((error = get_user(block, (int *) arg)) != 0)
 				return error;
 
@@ -52,11 +54,11 @@
 	unsigned int flag;
 	int on, error = -EBADF;
 
-	lock_kernel();
 	filp = fget(fd);
 	if (!filp)
 		goto out;
 	error = 0;
+	lock_kernel();
 	switch (cmd) {
 		case FIOCLEX:
 			FD_SET(fd, &current->files->close_on_exec);
@@ -107,8 +109,8 @@
 				error = filp->f_op->ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
 	}
 	fput(filp);
+	unlock_kernel();
 
 out:
-	unlock_kernel();
 	return error;
 }