From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: tj@kernel.org, pmatouse@redhat.com,
"James E.J. Bottomley" <JBottomley@parallels.com>,
linux-scsi@kernel.org, Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 05/13] sg_io: whitelist a few more commands for rare & obsolete device types
Date: Thu, 24 Jan 2013 16:00:41 +0100 [thread overview]
Message-ID: <1359039649-17734-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1359039649-17734-1-git-send-email-pbonzini@redhat.com>
Start cleaning up the table, moving out of the way four
rare & obsolete device types: "processor devices", printers,
communication devices (network cards) and scanners. Add
missing commands for these four device types.
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-scsi@kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/scsi_ioctl.c | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index c266546..084b943 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -141,7 +141,7 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
sgio_bitmap_set(0x03, -1 , read); // REQUEST SENSE
sgio_bitmap_set(0x12, -1 , read); // INQUIRY
sgio_bitmap_set(0x1A, -1 , 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, ~B , read); // RECEIVE DIAGNOSTIC RESULTS
sgio_bitmap_set(0x2B, D|T| W|R|O|M| K , read); // SEEK(10)
sgio_bitmap_set(0x3C, ~B , read); // READ BUFFER
@@ -163,21 +163,21 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter)
/* input */
- sgio_bitmap_set(0x08, D|T| P|W| O| C , 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 , 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 , write); // WRITE(6)
- sgio_bitmap_set(0x2A, D| W|R|O| B|K| C|S, write); // WRITE(10)
+ sgio_bitmap_set(0x04, D|T| R|O , write); // FORMAT UNIT
+ sgio_bitmap_set(0x0A, D|T| 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)
@@ -185,11 +185,24 @@ 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 ??
+ /* processor device */
+
+ sgio_bitmap_set(0x08, P , read); // RECEIVE
+ sgio_bitmap_set(0x0A, P , write); // SEND(6)
+
+ /* 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
@@ -232,6 +245,24 @@ 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) */
+
+ sgio_bitmap_set(0x1B, S, write); // SCAN
+ sgio_bitmap_set(0x24, S, write); // SET WINDOW
+ sgio_bitmap_set(0x25, S, write); // GET WINDOW
+ sgio_bitmap_set(0x2A, S, write); // SEND(10)
+ sgio_bitmap_set(0x31, S, write); // OBJECT POSITION
+ sgio_bitmap_set(0x34, S, write); // GET DATA BUFFER STATUS
+
#undef D
#undef T
#undef L
--
1.7.1
next prev parent reply other threads:[~2013-01-24 15:07 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 15:00 [PATCH 00/13] Corrections and customization of the SG_IO command whitelist (CVE-2012-4542) Paolo Bonzini
2013-01-24 15:00 ` [PATCH 01/13] sg_io: pass request_queue to blk_verify_command Paolo Bonzini
2013-01-24 22:34 ` Tejun Heo
2013-01-24 15:00 ` [PATCH 02/13] sg_io: reorganize list of allowed commands Paolo Bonzini
2013-01-24 22:42 ` Tejun Heo
2013-01-24 22:49 ` Tejun Heo
2013-01-24 22:58 ` Tejun Heo
2013-01-25 10:01 ` Paolo Bonzini
2013-01-25 17:13 ` Tejun Heo
2013-01-25 17:26 ` Paolo Bonzini
2013-01-24 15:00 ` [PATCH 03/13] sg_io: use different default filters for each device class Paolo Bonzini
2013-01-24 15:00 ` [PATCH 04/13] sg_io: resolve conflicts between commands assigned to multiple classes (CVE-2012-4542) Paolo Bonzini
2013-01-24 15:00 ` Paolo Bonzini [this message]
2013-01-24 15:00 ` [PATCH 06/13] sg_io: whitelist a few more commands for multimedia devices Paolo Bonzini
2013-01-24 22:55 ` Tejun Heo
2013-01-25 9:26 ` Paolo Bonzini
2013-01-25 17:04 ` Tejun Heo
2013-01-25 17:16 ` Paolo Bonzini
2013-01-25 17:28 ` Tejun Heo
2013-01-25 17:57 ` Paolo Bonzini
2013-01-25 18:13 ` Tejun Heo
2013-01-25 18:47 ` Paolo Bonzini
2013-01-25 19:01 ` Tejun Heo
2013-01-25 22:32 ` Paolo Bonzini
2013-01-25 22:41 ` Tejun Heo
2013-01-25 23:32 ` Paolo Bonzini
2013-01-25 23:47 ` Tejun Heo
2013-01-26 10:18 ` Paolo Bonzini
2013-01-24 15:00 ` [PATCH 07/13] sg_io: whitelist a few more commands for media changers Paolo Bonzini
2013-01-24 15:00 ` [PATCH 08/13] sg_io: whitelist a few more commands for tapes Paolo Bonzini
2013-01-24 15:00 ` [PATCH 09/13] sg_io: whitelist a few more commands for disks Paolo Bonzini
2013-01-24 15:00 ` [PATCH 10/13] sg_io: whitelist a few obsolete commands Paolo Bonzini
2013-01-24 15:00 ` [PATCH 11/13] sg_io: add list of commands that were in the consulted list but are disabled Paolo Bonzini
2013-01-24 15:00 ` [PATCH 12/13] sg_io: remove remnants of sysfs SG_IO filters Paolo Bonzini
2013-01-24 15:00 ` [PATCH 13/13] sg_io: introduce unpriv_sgio queue flag 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=1359039649-17734-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@kernel.org \
--cc=pmatouse@redhat.com \
--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
all inboxes | Powered by JetHome®