Attachment 23859 Details for Bug 60904

[patch] Add permission based command table to scsi_ioctl.c

01-sgio-cmd-table (text/plain), 6.47 KB, created by Jens Axboe on 2004-09-23 20:57:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Axboe

Created: 2004-09-23 20:57:37 UTC

Size: 6.47 KB

patch

obsolete

>diff -urp /opt/kernel/linux-2.6.5/drivers/block/scsi_ioctl.c linux-2.6.5/drivers/block/scsi_ioctl.c
>--- /opt/kernel/linux-2.6.5/drivers/block/scsi_ioctl.c	2004-09-23 14:42:58.202108421 +0200
>+++ linux-2.6.5/drivers/block/scsi_ioctl.c	2004-09-23 14:52:38.988164441 +0200
>@@ -105,8 +105,107 @@ static int sg_emulated_host(request_queu
> 	return put_user(1, p);
> }
> 
>-static int sg_io(request_queue_t *q, struct gendisk *bd_disk,
>-		 struct sg_io_hdr *hdr)
>+#define CMD_READ_SAFE	0x01
>+#define CMD_WRITE_SAFE	0x02
>+#define safe_for_read(cmd)	[cmd] = CMD_READ_SAFE
>+#define safe_for_write(cmd)	[cmd] = CMD_WRITE_SAFE
>+
>+static int verify_command(struct file *file, unsigned char *cmd)
>+{
>+	static const unsigned char cmd_type[256] = {
>+
>+		/* Basic read-only commands */
>+		safe_for_read(TEST_UNIT_READY),
>+		safe_for_read(REQUEST_SENSE),
>+		safe_for_read(READ_6),
>+		safe_for_read(READ_10),
>+		safe_for_read(READ_12),
>+		safe_for_read(READ_16),
>+		safe_for_read(READ_BUFFER),
>+		safe_for_read(READ_LONG),
>+		safe_for_read(INQUIRY),
>+		safe_for_read(MODE_SENSE),
>+		safe_for_read(MODE_SENSE_10),
>+		safe_for_read(START_STOP),
>+		safe_for_read(GPCMD_VERIFY_10),
>+		safe_for_read(VERIFY_16),
>+		safe_for_read(READ_BUFFER),
>+
>+		/* Audio CD commands */
>+		safe_for_read(GPCMD_PLAY_CD),
>+		safe_for_read(GPCMD_PLAY_AUDIO_10),
>+		safe_for_read(GPCMD_PLAY_AUDIO_MSF),
>+		safe_for_read(GPCMD_PLAY_AUDIO_TI),
>+		safe_for_read(GPCMD_PAUSE_RESUME),
>+
>+		/* CD/DVD data reading */
>+		safe_for_read(GPCMD_READ_CD),
>+		safe_for_read(GPCMD_READ_CD_MSF),
>+		safe_for_read(GPCMD_READ_DISC_INFO),
>+		safe_for_read(GPCMD_READ_CDVD_CAPACITY),
>+		safe_for_read(GPCMD_READ_DVD_STRUCTURE),
>+		safe_for_read(GPCMD_READ_HEADER),
>+		safe_for_read(GPCMD_READ_TRACK_RZONE_INFO),
>+		safe_for_read(GPCMD_READ_SUBCHANNEL),
>+		safe_for_read(GPCMD_READ_TOC_PMA_ATIP),
>+		safe_for_read(GPCMD_REPORT_KEY),
>+		safe_for_read(GPCMD_SCAN),
>+		safe_for_read(GPCMD_GET_CONFIGURATION),
>+		safe_for_read(GPCMD_READ_FORMAT_CAPACITIES),
>+		safe_for_read(GPCMD_GET_EVENT_STATUS_NOTIFICATION),
>+		safe_for_read(GPCMD_GET_PERFORMANCE),
>+		safe_for_read(GPCMD_SEEK),
>+		safe_for_read(GPCMD_STOP_PLAY_SCAN),
>+
>+		/* Basic writing commands */
>+		safe_for_write(WRITE_6),
>+		safe_for_write(WRITE_10),
>+		safe_for_write(WRITE_VERIFY),
>+		safe_for_write(WRITE_12),
>+		safe_for_write(WRITE_VERIFY_12),
>+		safe_for_write(WRITE_16),
>+		safe_for_write(WRITE_LONG),
>+		safe_for_write(ERASE),
>+		safe_for_write(GPCMD_MODE_SELECT_10),
>+		safe_for_write(MODE_SELECT),
>+		safe_for_write(GPCMD_BLANK),
>+		safe_for_write(GPCMD_CLOSE_TRACK),
>+		safe_for_write(GPCMD_FLUSH_CACHE),
>+		safe_for_write(GPCMD_FORMAT_UNIT),
>+		safe_for_write(GPCMD_REPAIR_RZONE_TRACK),
>+		safe_for_write(GPCMD_RESERVE_RZONE_TRACK),
>+		safe_for_write(GPCMD_SEND_DVD_STRUCTURE),
>+		safe_for_write(GPCMD_SEND_EVENT),
>+		safe_for_write(GPCMD_SEND_KEY),
>+		safe_for_write(GPCMD_SEND_OPC),
>+		safe_for_write(GPCMD_SEND_CUE_SHEET),
>+		safe_for_write(GPCMD_SET_SPEED),
>+		safe_for_write(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL),
>+		safe_for_write(GPCMD_LOAD_UNLOAD),
>+		safe_for_write(GPCMD_SET_STREAMING),
>+	};
>+	unsigned char type = cmd_type[cmd[0]];
>+
>+	/* Anybody who can open the device can do a read-safe command */
>+	if (type & CMD_READ_SAFE)
>+		return 0;
>+
>+	/* Write-safe commands just require a writable open.. */
>+	if (type & CMD_WRITE_SAFE) {
>+		if (file->f_mode & FMODE_WRITE)
>+			return 0;
>+	}
>+
>+	/* And root can do any command.. */
>+	if (capable(CAP_SYS_RAWIO))
>+		return 0;
>+
>+	/* Otherwise fail it with an "Operation not permitted" */
>+	return -EPERM;
>+}
>+
>+static int sg_io(struct file *file, request_queue_t *q,
>+		struct gendisk *bd_disk, struct sg_io_hdr *hdr)
> {
> 	unsigned long start_time;
> 	int reading, writing;
>@@ -118,6 +217,8 @@ static int sg_io(request_queue_t *q, str
> 		return -EINVAL;
> 	if (hdr->cmd_len > sizeof(rq->cmd))
> 		return -EINVAL;
>+	if (verify_command(file, hdr->cmdp))
>+		return -EPERM;
> 
> 	/*
> 	 * we'll do that later
>@@ -218,8 +319,8 @@ static int sg_io(request_queue_t *q, str
> 
> #define OMAX_SB_LEN 16          /* For backward compatibility */
> 
>-static int sg_scsi_ioctl(request_queue_t *q, struct gendisk *bd_disk,
>-			 Scsi_Ioctl_Command *sic)
>+static int sg_scsi_ioctl(struct file *file, request_queue_t *q,
>+			 struct gendisk *bd_disk, Scsi_Ioctl_Command __user *sic)
> {
> 	struct request *rq;
> 	int err, in_len, out_len, bytes, opcode, cmdlen;
>@@ -261,6 +362,10 @@ static int sg_scsi_ioctl(request_queue_t
> 	if (copy_from_user(buffer, sic->data + cmdlen, in_len))
> 		goto error;
> 
>+	err = verify_command(file, rq->cmd);
>+	if (err)
>+		goto error;
>+
> 	switch (opcode) {
> 		case SEND_DIAGNOSTIC:
> 		case FORMAT_UNIT:
>@@ -369,7 +474,7 @@ int scsi_cmd_ioctl(struct file *file, st
> 
> 			old_cdb = hdr.cmdp;
> 			hdr.cmdp = cdb;
>-			err = sg_io(q, bd_disk, &hdr);
>+			err = sg_io(file, q, bd_disk, &hdr);
> 			if (err == -EFAULT)
> 				break;
> 
>@@ -418,7 +523,7 @@ int scsi_cmd_ioctl(struct file *file, st
> 			hdr.cmdp = cgc.cmd;
> 			hdr.cmd_len = sizeof(cgc.cmd);
> 
>-			err = sg_io(q, bd_disk, &hdr);
>+			err = sg_io(file, q, bd_disk, &hdr);
> 			if (err == -EFAULT)
> 				break;
> 
>@@ -441,7 +546,7 @@ int scsi_cmd_ioctl(struct file *file, st
> 			if (!arg)
> 				break;
> 
>-			err = sg_scsi_ioctl(q, bd_disk,
>+			err = sg_scsi_ioctl(file, q, bd_disk,
> 					    (Scsi_Ioctl_Command *)arg);
> 			break;
> 		case CDROMCLOSETRAY:
>diff -urp /opt/kernel/linux-2.6.5/include/linux/cdrom.h linux-2.6.5/include/linux/cdrom.h
>--- /opt/kernel/linux-2.6.5/include/linux/cdrom.h	2004-09-23 14:42:58.000000000 +0200
>+++ linux-2.6.5/include/linux/cdrom.h	2004-09-23 14:46:30.000000000 +0200
>@@ -467,9 +467,10 @@ struct cdrom_generic_command
> #define GPCMD_REPORT_KEY		    0xa4
> #define GPCMD_REQUEST_SENSE		    0x03
> #define GPCMD_RESERVE_RZONE_TRACK	    0x53
>+#define GPCMD_SEND_CUE_SHEET		    0x5d
> #define GPCMD_SCAN			    0xba
> #define GPCMD_SEEK			    0x2b
>-#define GPCMD_SEND_DVD_STRUCTURE	    0xad
>+#define GPCMD_SEND_DVD_STRUCTURE	    0xbf
> #define GPCMD_SEND_EVENT		    0xa2
> #define GPCMD_SEND_KEY			    0xa3
> #define GPCMD_SEND_OPC			    0x54
>diff -urp /opt/kernel/linux-2.6.5/include/scsi/scsi.h linux-2.6.5/include/scsi/scsi.h
>--- /opt/kernel/linux-2.6.5/include/scsi/scsi.h	2004-09-23 14:36:21.000000000 +0200
>+++ linux-2.6.5/include/scsi/scsi.h	2004-09-23 14:51:08.251845283 +0200
>@@ -111,6 +111,7 @@ extern const char *const scsi_device_typ
> #define WRITE_LONG_2          0xea
> #define READ_16               0x88
> #define WRITE_16              0x8a
>+#define VERIFY_16	      0x8f
> #define SERVICE_ACTION_IN     0x9e
> /* values for service action in */
> #define	SAI_READ_CAPACITY_16  0x10

Actions: View | Diff

Attachments on bug 60904: 23858 | 23859