lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] SCSI tape: fix permissions for SG_IO, etc.

Browse Source 
This patch is against 2.6.12-rc3 + linus-patch from April 30. The patch
contains the following fixes:

- CAP_SYS_RAWIO is used instead of CAP_SYS_ADMIN; fix from Alan Cox
- only direct sending of SCSI commands requires this permission
- the st status is modified is successful unload is performed using
  SCSI_IOCTL_STOP_UNIT

Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Kai Makisara
2005-05-01 18:11:55 +03:00
committed by James Bottomley
parent f80ed13934
commit 16c4b3e207
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/scsi/st.c
View File

@@ -17,7 +17,7 @@
Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
*/ */
static char *verstr = "20050312"; static char *verstr = "20050501";
#include <linux/module.h> #include <linux/module.h>
@@ -29,6 +29,7 @@ static char *verstr = "20050312";
#include <linux/string.h> #include <linux/string.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/mtio.h> #include <linux/mtio.h>
#include <linux/cdrom.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
@@ -50,6 +51,7 @@ static char *verstr = "20050312";
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <scsi/scsi_ioctl.h> #include <scsi/scsi_ioctl.h>
#include <scsi/scsi_request.h> #include <scsi/scsi_request.h>
#include <scsi/sg.h>
/* The driver prints some debugging information on the console if DEBUG /* The driver prints some debugging information on the console if DEBUG
@@ -3463,7 +3465,10 @@ static int st_ioctl(struct inode *inode, struct file *file,
case SCSI_IOCTL_GET_BUS_NUMBER: case SCSI_IOCTL_GET_BUS_NUMBER:
break; break;
default: default:
if (!capable(CAP_SYS_ADMIN)) if ((cmd_in == SG_IO ||
cmd_in == SCSI_IOCTL_SEND_COMMAND ||
cmd_in == CDROM_SEND_PACKET) &&
!capable(CAP_SYS_RAWIO))
i = -EPERM; i = -EPERM;
else else
i = scsi_cmd_ioctl(file, STp->disk, cmd_in, p); i = scsi_cmd_ioctl(file, STp->disk, cmd_in, p);
@@ -3471,10 +3476,12 @@ static int st_ioctl(struct inode *inode, struct file *file,
return i; return i;
break; break;
} }
if (!capable(CAP_SYS_ADMIN) && retval = scsi_ioctl(STp->device, cmd_in, p);
(cmd_in == SCSI_IOCTL_START_UNIT || cmd_in == SCSI_IOCTL_STOP_UNIT)) if (!retval && cmd_in == SCSI_IOCTL_STOP_UNIT) { /* unload */
return -EPERM; STp->rew_at_close = 0;
return scsi_ioctl(STp->device, cmd_in, p); STp->ready = ST_NO_TAPE;
}
return retval;
out: out:
up(&STp->lock); up(&STp->lock);