linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>,
	"James E.J. Bottomley" <JBottomley@parallels.com>,
	linux-scsi@vger.kernel.org, Jens Axboe <axboe@kernel.dk>
Subject: [PATCH v2 05/14] sg_io: whitelist a few more commands for rare & obsolete device types
Date: Wed,  6 Feb 2013 16:15:52 +0100	[thread overview]
Message-ID: <1360163761-8541-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1360163761-8541-1-git-send-email-pbonzini@redhat.com>

Start cleaning up the table, moving out of the way four rare & obsolete
device types: printers, communication devices (network cards) and scanners
(both TYPE_PROCESSOR and TYPE_SCANNER).  Add missing commands for these
four device types.

Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
	v1->v2: added more scanner commands, list taken from SANE

 block/scsi_ioctl.c |   83 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 7ea3428..e71cd42 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -142,7 +142,7 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
 	sgio_bitmap_set(0x03, D|T|L|P|W|R|O|M|A|E|B|K|V|F|C|S, read);  /* REQUEST SENSE */
 	sgio_bitmap_set(0x12, D|T|L|P|W|R|O|M|A|E|B|K|V|F|C|S, read);  /* INQUIRY */
 	sgio_bitmap_set(0x1A, D|T|L|P|W|R|O|M|A|E|B|K|V|F|C|S, read);  /* MODE SENSE(6) */
-	sgio_bitmap_set(0x1B, D|T|L|  W|R|O|M|A|  B|K|V|F|  S, read);  /* START STOP UNIT */
+	sgio_bitmap_set(0x1B, D|T|    W|R|O|M|A|  B|K|V|F    , read);  /* START STOP UNIT */
 	sgio_bitmap_set(0x1C, D|T|B|O|W|R|O|M|A|E|  K|V|F|C|S, read);  /* RECEIVE DIAGNOSTIC RESULTS */
 	sgio_bitmap_set(0x2B, D|T|    W|R|O|M|      K        , read);  /* SEEK(10) */
 	sgio_bitmap_set(0x3C, D|T|B|O|W|R|O|M|A|E|  K|V|F|C|S, read);  /* READ BUFFER */
@@ -164,21 +164,21 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
 
 	/* input */
 
-	sgio_bitmap_set(0x08, D|T|  P|W|  O|              C|S, read);  /* READ(6) */
-	sgio_bitmap_set(0x25, D|      W|R|O|      B|K|      S, read);  /* READ CAPACITY(10) */
-	sgio_bitmap_set(0x28, D|      W|R|O|      B|K|    C|S, read);  /* READ(10) */
+	sgio_bitmap_set(0x08, D|T|    W|  O                  , read);  /* READ(6) */
+	sgio_bitmap_set(0x25, D|      W|R|O|      B|K        , read);  /* READ CAPACITY(10) */
+	sgio_bitmap_set(0x28, D|      W|R|O|      B|K        , read);  /* READ(10) */
 	sgio_bitmap_set(0x2F, D|      W|R|O                  , read);  /* VERIFY(10) */
 	sgio_bitmap_set(0x37, D|          O|M                , read);  /* READ DEFECT DATA(10) */
 	sgio_bitmap_set(0x3E, D|      W|  O                  , read);  /* READ LONG(10) */
 	sgio_bitmap_set(0x88, D|T|    W|  O|      B          , read);  /* READ(16) */
 	sgio_bitmap_set(0x8F, D|T|    W|  O|      B          , read);  /* VERIFY(16) */
-	sgio_bitmap_set(0xA8, D|      W|R|O|              C  , read);  /* READ(12) */
+	sgio_bitmap_set(0xA8, D|      W|R|O                  , read);  /* READ(12) */
 
 	/* write */
 
 	sgio_bitmap_set(0x04, D|T|L|    R|O                  , write); /* FORMAT UNIT */
-	sgio_bitmap_set(0x0A, D|T|L|P|W|  O|              C|S, write); /* WRITE(6) */
-	sgio_bitmap_set(0x2A, D|      W|R|O|      B|K|    C|S, write); /* WRITE(10) */
+	sgio_bitmap_set(0x0A, D|T|L|  W|  O                  , write); /* WRITE(6) */
+	sgio_bitmap_set(0x2A, D|      W|R|O|      B|K        , write); /* WRITE(10) */
 	sgio_bitmap_set(0x2E, D|      W|R|O|      B|K        , write); /* WRITE AND VERIFY(10) */
 	sgio_bitmap_set(0x35, D|      W|R|O|      B|K        , write); /* SYNCHRONIZE CACHE(10) */
 	sgio_bitmap_set(0x3F, D|      W|  O                  , write); /* WRITE LONG(10) */
@@ -186,11 +186,19 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
 	sgio_bitmap_set(0x48, D|                  B          , write); /* SANITIZE */
 	sgio_bitmap_set(0x51, D                              , write); /* XPWRITE(10) */
 	sgio_bitmap_set(0x8A, D|T|    W|  O|      B          , write); /* WRITE(16) */
-	sgio_bitmap_set(0xAA, D|      W|R|O|              C  , write); /* WRITE(12) */
+	sgio_bitmap_set(0xAA, D|      W|R|O                  , write); /* WRITE(12) */
 	sgio_bitmap_set(0xAC,             O                  , write); /* ERASE(12) */
 	sgio_bitmap_set(0xAE, D|      W|  O                  , write); /* WRITE AND VERIFY(12) */
 	sgio_bitmap_set(0xEA, D|      W|  O                  , write); /* WRITE_LONG_2 ?? */
 
+	/* printer */
+
+	sgio_bitmap_set(0x04,     L                          , write); /* FORMAT */
+	sgio_bitmap_set(0x0A,     L                          , write); /* PRINT */
+	sgio_bitmap_set(0x0B,     L                          , write); /* SLEW AND PRINT */
+	sgio_bitmap_set(0x10,     L                          , write); /* SYNCHRONIZE BUFFER */
+	sgio_bitmap_set(0x1B,     L                          , write); /* STOP PRINT */
+
 	/* (mostly) MMC */
 
 	sgio_bitmap_set(0x23,           R                    , read);  /* READ FORMAT CAPACITIES */
@@ -233,6 +241,65 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
 
 	sgio_bitmap_set(0x19,   T                            , write); /* ERASE(6) */
 
+	/* communication devices (obsolete) */
+
+	sgio_bitmap_set(0x08,                             C  , write); /* GET MESSAGE(6) */
+	sgio_bitmap_set(0x0A,                             C  , write); /* SEND MESSAGE(6) */
+	sgio_bitmap_set(0x28,                             C  , write); /* GET MESSAGE(10) */
+	sgio_bitmap_set(0x2A,                             C  , write); /* SEND MESSAGE(10) */
+	sgio_bitmap_set(0xA8,                             C  , write); /* GET MESSAGE(12) */
+	sgio_bitmap_set(0xAA,                             C  , write); /* SEND MESSAGE(12) */
+
+	/*
+	 * scanners (obsolete).  Some scanners use TYPE_PROCESSOR,
+	 * allow both flags for all commands.
+	 */
+
+	sgio_bitmap_set(0x08,       P|                      S, read);  /* RECEIVE */
+	sgio_bitmap_set(0x0A,       P|                      S, write); /* SEND(6) */
+	sgio_bitmap_set(0x16,       P|                      S, write); /* RESERVE UNIT */
+	sgio_bitmap_set(0x17,       P|                      S, write); /* RELEASE UNIT */
+	sgio_bitmap_set(0x1B,       P|                      S, write); /* SCAN */
+	sgio_bitmap_set(0x1D,       P|                      S, write); /* SEND DIAGNOSTIC */
+	sgio_bitmap_set(0x24,       P|                      S, write); /* SET WINDOW */
+	sgio_bitmap_set(0x25,       P|                      S, write); /* GET WINDOW */
+	sgio_bitmap_set(0x08,       P|                      S, read);  /* RECEIVE */
+	sgio_bitmap_set(0x0A,       P|                      S, write); /* SEND(6) */
+	sgio_bitmap_set(0x31,       P|                      S, write); /* OBJECT POSITION */
+	sgio_bitmap_set(0x34,       P|                      S, write); /* GET DATA BUFFER STATUS */
+
+	/*
+	 * scanner vendor-specific commands, taken from SANE.
+	 * SG_IO for TYPE_SCANNER actually is not subject to
+	 * the whitelist, but let's be complete.  TYPE_PROCESSOR
+	 * has always been subject to the whitelist, so do not
+	 * include the P flag here.
+	 */
+	sgio_bitmap_set(0x04,                               S, write); /* Mustek AREA AND WINDOWS */
+	sgio_bitmap_set(0x06,                               S, write); /* Xerox ABORT */
+	sgio_bitmap_set(0x09,                               S, write); /* Vendor specific ??? */
+	sgio_bitmap_set(0x0C,                               S, write); /* Vendor specific ??? */
+	sgio_bitmap_set(0x0E,                               S, write); /* Vendor specific ??? */
+	sgio_bitmap_set(0x0F,                               S, write); /* Mustek GET IMAGE STATUS */
+	sgio_bitmap_set(0x10,                               S, write); /* Mustek ADF AND BACKTRACK */
+	sgio_bitmap_set(0x11,                               S, write); /* Mustek CCD DISTANCE */
+	sgio_bitmap_set(0x1C,                               S, write); /* Vendor specific ??? */
+	sgio_bitmap_set(0x29,                               S, write); /* Xerox READ IMAGE */
+	sgio_bitmap_set(0x55,                               S, write); /* Mustek LOOKUP TABLE */
+	sgio_bitmap_set(0x5E,                               S, write); /* Umax GET LAMP STATUS */
+	sgio_bitmap_set(0x5F,                               S, write); /* Umax SET LAMP STATUS */
+	sgio_bitmap_set(0xA2,                               S, write); /* Coolscan AUTO FOCUS */
+	sgio_bitmap_set(0xC0,                               S, write); /* Fujitsu SET SUBWINDOW */
+	sgio_bitmap_set(0xC1,                               S, write); /* Fujitsu ENDORSER */
+	sgio_bitmap_set(0xC2,                               S, write); /* Fujitsu GET HW STATUS */
+	sgio_bitmap_set(0xD5,                               S, write); /* Canon GET SCAN MODE */
+	sgio_bitmap_set(0xD6,                               S, write); /* Canon SET SCAN MODE */
+	sgio_bitmap_set(0xD8,                               S, write); /* Canon CANCEL */
+	sgio_bitmap_set(0xE0,                               S, write); /* Panasonic GET ADJUST DATA */
+	sgio_bitmap_set(0xE1,                               S, write); /* Panasonic SET TIMEOUT */
+	sgio_bitmap_set(0xE5,                               S, write); /* Canon SET SCAN MODE */
+	sgio_bitmap_set(0xF1,                               S, write); /* Fujitsu SCANNER CONTROL */
+
 #undef D
 #undef T
 #undef L
-- 
1.7.1

  parent reply	other threads:[~2013-02-06 15:15 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-06 15:15 [PATCH v2 00/14] Corrections and customization of the SG_IO command whitelist (CVE-2012-4542) Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 01/14] sg_io: pass request_queue to blk_verify_command Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 02/14] sg_io: reorganize list of allowed commands Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 03/14] sg_io: use different default filters for each device class Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 04/14] sg_io: resolve conflicts between commands assigned to multiple classes (CVE-2012-4542) Paolo Bonzini
2013-02-06 15:15 ` Paolo Bonzini [this message]
2013-02-06 15:15 ` [PATCH v2 06/14] sg_io: whitelist another command for multimedia devices Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 07/14] sg_io: whitelist a few more commands for media changers Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 08/14] sg_io: whitelist a few more commands for tapes Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 09/14] sg_io: whitelist a few more commands for disks Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 10/14] sg_io: whitelist a few obsolete commands Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 11/14] sg_io: mark blk_set_cmd_filter_defaults as __init Paolo Bonzini
2013-02-06 15:15 ` [PATCH v2 12/14] sg_io: remove remnants of sysfs SG_IO filters Paolo Bonzini
2013-02-06 15:16 ` [PATCH v2 13/14] sg_io: introduce unpriv_sgio queue flag Paolo Bonzini
2013-02-06 15:16 ` [PATCH v2 14/14] sg_io: use unpriv_sgio to disable whitelisting for scanners Paolo Bonzini
2013-02-13  8:32 ` [PATCH v2 00/14] Corrections and customization of the SG_IO command whitelist (CVE-2012-4542) Paolo Bonzini
2013-02-13 15:35   ` Douglas Gilbert
2013-02-13 15:48     ` Paolo Bonzini
2013-02-20 16:12 ` Paolo Bonzini
2013-03-22 22:30   ` PING^2 " Paolo Bonzini
2013-04-04 18:18     ` PING^3 " Paolo Bonzini
2013-04-17 12:26       ` PING^4 aka The Jon Corbet Effect " Paolo Bonzini
2013-04-27 13:31         ` PING^5 aka New ways to attract attentions " Paolo Bonzini
2013-05-06 20:43   ` PING^6 " Paolo Bonzini
2013-05-22  6:35 ` PING^7 (was Re: [PATCH v2 00/14] Corrections and customization of the SG_IO command whitelist (CVE-2012-4542)) Paolo Bonzini
2013-05-22  9:32   ` Tejun Heo
2013-05-22  9:53     ` Paolo Bonzini
2013-05-22 10:02       ` Tejun Heo
2013-05-22 10:23         ` Paolo Bonzini
2013-05-22 12:07           ` James Bottomley
2013-05-22 14:07             ` Paolo Bonzini
2013-05-22 16:31               ` Paolo Bonzini
2013-05-22 13:41           ` Tejun Heo
2013-05-22 14:12             ` Paolo Bonzini
2013-05-22 14:30               ` Tejun Heo
2013-05-22 15:00                 ` Paolo Bonzini
2013-05-22 19:30                   ` Tejun Heo
2013-05-22 21:18                     ` Paolo Bonzini
2013-05-22 22:17                       ` Tejun Heo
2013-05-23  0:54                         ` Tejun Heo
2013-05-23  7:45                         ` Paolo Bonzini
2013-05-23  9:02                           ` Tejun Heo
2013-05-23  9:47                             ` Paolo Bonzini
2013-05-24  1:44                               ` Tejun Heo
2013-05-24  7:13                                 ` Paolo Bonzini
2013-05-24  8:02                                   ` Tejun Heo
2013-05-24  8:31                                     ` Paolo Bonzini
2013-05-24  9:07                                       ` Tejun Heo
2013-05-24  9:45                                         ` Paolo Bonzini
2013-05-24 22:20                                           ` Tejun Heo
2013-05-25  4:35                                     ` James Bottomley
2013-05-25  5:27                                       ` Christoph Hellwig
2013-05-25  7:05                                         ` Paolo Bonzini
2013-05-25  7:11                                           ` Christoph Hellwig
2013-05-25  7:21                                             ` Paolo Bonzini
2013-06-21 11:57                                           ` Christoph Hellwig
2013-05-25  8:37                                       ` Tejun Heo
2013-05-25 11:14                                         ` Paolo Bonzini
2013-05-25 12:48                                           ` Tejun Heo
2013-05-25 12:56                                             ` Paolo Bonzini
2013-05-22 15:03               ` Theodore Ts'o
2013-05-22 15:53                 ` Paolo Bonzini
2013-05-22 16:32                   ` Martin K. Petersen
2013-05-22 17:00                     ` Paolo Bonzini
2013-05-22 18:11                       ` Theodore Ts'o
2013-05-22 19:37                         ` Paolo Bonzini
2013-05-22 20:19                           ` Theodore Ts'o
2013-05-22 20:36                             ` Paolo Bonzini
2013-05-25  3:54                     ` Vladislav Bolkhovitin
2013-05-28 20:25                       ` Martin K. Petersen
2013-05-29  6:12                         ` Vladislav Bolkhovitin
2013-05-22 20:39                   ` Tejun Heo
2013-05-22 21:12                     ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1360163761-8541-6-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=JBottomley@parallels.com \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).