* [PATCH stable 1/4] kernel.h: add printk_ratelimited and pr_<level>_rl
2012-01-17 3:58 ` Ben Hutchings
@ 2012-01-17 4:06 ` Ben Hutchings
2012-01-17 4:06 ` [PATCH stable 2/4] block: add and use scsi_blk_cmd_ioctl Ben Hutchings
` (2 subsequent siblings)
3 siblings, 0 replies; 15+ messages in thread
From: Ben Hutchings @ 2012-01-17 4:06 UTC (permalink / raw)
To: stable
Cc: Paolo Bonzini, Linus Torvalds, linux-kernel, Petr Matousek,
linux-scsi, Jens Axboe, James Bottomley
From: Joe Perches <joe@perches.com>
commit 8a64f336bc1d4aa203b138d29d5a9c414a9fbb47 upstream.
Add a printk_ratelimited statement expression macro that uses a per-call
ratelimit_state so that multiple subsystems output messages are not
suppressed by a global __ratelimit state.
[akpm@linux-foundation.org: coding-style fixes]
[akpm@linux-foundation.org: s/_rl/_ratelimited/g]
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Naohiro Ooiwa <nooiwa@miraclelinux.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---
This is a prerequisite for patch 3.
Ben.
include/linux/kernel.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index f4e3184..1221fe4 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -407,6 +407,50 @@ static inline char *pack_hex_byte(char *buf, u8 byte)
#endif
/*
+ * ratelimited messages with local ratelimit_state,
+ * no local ratelimit_state used in the !PRINTK case
+ */
+#ifdef CONFIG_PRINTK
+#define printk_ratelimited(fmt, ...) ({ \
+ static struct ratelimit_state _rs = { \
+ .interval = DEFAULT_RATELIMIT_INTERVAL, \
+ .burst = DEFAULT_RATELIMIT_BURST, \
+ }; \
+ \
+ if (!__ratelimit(&_rs)) \
+ printk(fmt, ##__VA_ARGS__); \
+})
+#else
+/* No effect, but we still get type checking even in the !PRINTK case: */
+#define printk_ratelimited printk
+#endif
+
+#define pr_emerg_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_alert_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_crit_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_err_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_warning_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_notice_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_info_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+/* no pr_cont_ratelimited, don't do that... */
+/* If you are writing a driver, please use dev_dbg instead */
+#if defined(DEBUG)
+#define pr_debug_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_debug_ratelimited(fmt, ...) \
+ ({ if (0) printk_ratelimited(KERN_DEBUG pr_fmt(fmt), \
+ ##__VA_ARGS__); 0; })
+#endif
+
+/*
* General tracing related utility functions - trace_printk(),
* tracing_on/tracing_off and tracing_start()/tracing_stop
*
--
1.7.8.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH stable 2/4] block: add and use scsi_blk_cmd_ioctl
2012-01-17 3:58 ` Ben Hutchings
2012-01-17 4:06 ` [PATCH stable 1/4] kernel.h: add printk_ratelimited and pr_<level>_rl Ben Hutchings
@ 2012-01-17 4:06 ` Ben Hutchings
2012-01-17 4:07 ` [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices Ben Hutchings
2012-01-17 4:07 ` [PATCH stable 4/4] dm: do not forward ioctls from logical volumes to the underlying device Ben Hutchings
3 siblings, 0 replies; 15+ messages in thread
From: Ben Hutchings @ 2012-01-17 4:06 UTC (permalink / raw)
To: stable
Cc: Paolo Bonzini, Linus Torvalds, linux-kernel, Petr Matousek,
linux-scsi, Jens Axboe, James Bottomley
From: Paolo Bonzini <pbonzini@redhat.com>
commit 577ebb374c78314ac4617242f509e2f5e7156649 upstream.
Introduce a wrapper around scsi_cmd_ioctl that takes a block device.
The function will then be enhanced to detect partition block devices
and, in that case, subject the ioctls to whitelisting.
Cc: linux-scsi@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Cc: James Bottomley <JBottomley@parallels.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backport to 2.6.32 - adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
block/scsi_ioctl.c | 7 +++++++
drivers/block/cciss.c | 6 +++---
drivers/block/ub.c | 3 +--
drivers/block/virtio_blk.c | 4 ++--
drivers/cdrom/cdrom.c | 3 +--
drivers/ide/ide-floppy_ioctl.c | 3 +--
drivers/scsi/sd.c | 2 +-
include/linux/blkdev.h | 2 ++
8 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 1d5a780..114ee29 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -689,6 +689,13 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod
}
EXPORT_SYMBOL(scsi_cmd_ioctl);
+int scsi_cmd_blk_ioctl(struct block_device *bd, fmode_t mode,
+ unsigned int cmd, void __user *arg)
+{
+ return scsi_cmd_ioctl(bd->bd_disk->queue, bd->bd_disk, mode, cmd, arg);
+}
+EXPORT_SYMBOL(scsi_cmd_blk_ioctl);
+
int __init blk_scsi_ioctl_init(void)
{
blk_set_cmd_filter_defaults(&blk_default_cmd_filter);
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index ca9c548..68b90d9 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1583,7 +1583,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
return status;
}
- /* scsi_cmd_ioctl handles these, below, though some are not */
+ /* scsi_cmd_blk_ioctl handles these, below, though some are not */
/* very meaningful for cciss. SG_IO is the main one people want. */
case SG_GET_VERSION_NUM:
@@ -1594,9 +1594,9 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
case SG_EMULATED_HOST:
case SG_IO:
case SCSI_IOCTL_SEND_COMMAND:
- return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);
+ return scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
- /* scsi_cmd_ioctl would normally handle these, below, but */
+ /* scsi_cmd_blk_ioctl would normally handle these, below, but */
/* they aren't a good fit for cciss, as CD-ROMs are */
/* not supported, and we don't have any bus/target/lun */
/* which we present to the kernel. */
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index c739b20..c6ac1b2 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1726,10 +1726,9 @@ static int ub_bd_release(struct gendisk *disk, fmode_t mode)
static int ub_bd_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
- struct gendisk *disk = bdev->bd_disk;
void __user *usermem = (void __user *) arg;
- return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, usermem);
+ return scsi_cmd_blk_ioctl(bdev, mode, cmd, usermem);
}
/*
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 51042f0ba7..44d019b 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -200,8 +200,8 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
if (!virtio_has_feature(vblk->vdev, VIRTIO_BLK_F_SCSI))
return -ENOTTY;
- return scsi_cmd_ioctl(disk->queue, disk, mode, cmd,
- (void __user *)data);
+ return scsi_cmd_blk_ioctl(bdev, mode, cmd,
+ (void __user *)data);
}
/* We provide getgeo only to please some old bootloader/partitioning tools */
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 614da5b..59cccc9 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2684,12 +2684,11 @@ int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,
{
void __user *argp = (void __user *)arg;
int ret;
- struct gendisk *disk = bdev->bd_disk;
/*
* Try the generic SCSI command ioctl's first.
*/
- ret = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);
+ ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
if (ret != -ENOTTY)
return ret;
diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index 9c22882..05f024c 100644
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -287,8 +287,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct block_device *bdev,
* and CDROM_SEND_PACKET (legacy) ioctls
*/
if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
- err = scsi_cmd_ioctl(bdev->bd_disk->queue, bdev->bd_disk,
- mode, cmd, argp);
+ err = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
if (err == -ENOTTY)
err = generic_ide_ioctl(drive, bdev, cmd, arg);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 568d363..2dd1b73 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -838,7 +838,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,
case SCSI_IOCTL_GET_BUS_NUMBER:
return scsi_ioctl(sdp, cmd, p);
default:
- error = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, p);
+ error = scsi_cmd_blk_ioctl(bdev, mode, cmd, p);
if (error != -ENOTTY)
return error;
}
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a06bfab..63070ad 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -777,6 +777,8 @@ extern void blk_plug_device(struct request_queue *);
extern void blk_plug_device_unlocked(struct request_queue *);
extern int blk_remove_plug(struct request_queue *);
extern void blk_recount_segments(struct request_queue *, struct bio *);
+extern int scsi_cmd_blk_ioctl(struct block_device *, fmode_t,
+ unsigned int, void __user *);
extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
unsigned int, void __user *);
extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
--
1.7.8.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices
2012-01-17 3:58 ` Ben Hutchings
2012-01-17 4:06 ` [PATCH stable 1/4] kernel.h: add printk_ratelimited and pr_<level>_rl Ben Hutchings
2012-01-17 4:06 ` [PATCH stable 2/4] block: add and use scsi_blk_cmd_ioctl Ben Hutchings
@ 2012-01-17 4:07 ` Ben Hutchings
2012-01-17 9:55 ` Paolo Bonzini
2012-01-17 4:07 ` [PATCH stable 4/4] dm: do not forward ioctls from logical volumes to the underlying device Ben Hutchings
3 siblings, 1 reply; 15+ messages in thread
From: Ben Hutchings @ 2012-01-17 4:07 UTC (permalink / raw)
To: stable
Cc: Paolo Bonzini, Linus Torvalds, linux-kernel, Petr Matousek,
linux-scsi, Jens Axboe, James Bottomley
From: Paolo Bonzini <pbonzini@redhat.com>
commit 0bfc96cb77224736dfa35c3c555d37b3646ef35e upstream.
Linux allows executing the SG_IO ioctl on a partition or LVM volume, and
will pass the command to the underlying block device. This is
well-known, but it is also a large security problem when (via Unix
permissions, ACLs, SELinux or a combination thereof) a program or user
needs to be granted access only to part of the disk.
This patch lets partitions forward a small set of harmless ioctls;
others are logged with printk so that we can see which ioctls are
actually sent. In my tests only CDROM_GET_CAPABILITY actually occurred.
Of course it was being sent to a (partition on a) hard disk, so it would
have failed with ENOTTY and the patch isn't changing anything in
practice. Still, I'm treating it specially to avoid spamming the logs.
In principle, this restriction should include programs running with
CAP_SYS_RAWIO. If for example I let a program access /dev/sda2 and
/dev/sdb, it still should not be able to read/write outside the
boundaries of /dev/sda2 independent of the capabilities. However, for
now programs with CAP_SYS_RAWIO will still be allowed to send the
ioctls. Their actions will still be logged.
This patch does not affect the non-libata IDE driver. That driver
however already tests for bd != bd->bd_contains before issuing some
ioctl; it could be restricted further to forbid these ioctls even for
programs running with CAP_SYS_ADMIN/CAP_SYS_RAWIO.
Cc: linux-scsi@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>
Cc: James Bottomley <JBottomley@parallels.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
[ Make it also print the command name when warning - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backport to 2.6.32 - ENOIOCTLCMD does not get converted to
ENOTTY, so we must return ENOTTY directly]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
block/scsi_ioctl.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
drivers/scsi/sd.c | 11 +++++++++--
include/linux/blkdev.h | 1 +
3 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 114ee29..2be0a97 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -24,6 +24,7 @@
#include <linux/capability.h>
#include <linux/completion.h>
#include <linux/cdrom.h>
+#include <linux/ratelimit.h>
#include <linux/slab.h>
#include <linux/times.h>
#include <asm/uaccess.h>
@@ -689,9 +690,53 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod
}
EXPORT_SYMBOL(scsi_cmd_ioctl);
+int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
+{
+ if (bd && bd == bd->bd_contains)
+ return 0;
+
+ /* Actually none of these is particularly useful on a partition,
+ * but they are safe.
+ */
+ switch (cmd) {
+ case SCSI_IOCTL_GET_IDLUN:
+ case SCSI_IOCTL_GET_BUS_NUMBER:
+ case SCSI_IOCTL_GET_PCI:
+ case SCSI_IOCTL_PROBE_HOST:
+ case SG_GET_VERSION_NUM:
+ case SG_SET_TIMEOUT:
+ case SG_GET_TIMEOUT:
+ case SG_GET_RESERVED_SIZE:
+ case SG_SET_RESERVED_SIZE:
+ case SG_EMULATED_HOST:
+ return 0;
+ case CDROM_GET_CAPABILITY:
+ /* Keep this until we remove the printk below. udev sends it
+ * and we do not want to spam dmesg about it. CD-ROMs do
+ * not have partitions, so we get here only for disks.
+ */
+ return -ENOTTY;
+ default:
+ break;
+ }
+
+ /* In particular, rule out all resets and host-specific ioctls. */
+ printk_ratelimited(KERN_WARNING
+ "%s: sending ioctl %x to a partition!\n", current->comm, cmd);
+
+ return capable(CAP_SYS_RAWIO) ? 0 : -ENOTTY;
+}
+EXPORT_SYMBOL(scsi_verify_blk_ioctl);
+
int scsi_cmd_blk_ioctl(struct block_device *bd, fmode_t mode,
unsigned int cmd, void __user *arg)
{
+ int ret;
+
+ ret = scsi_verify_blk_ioctl(bd, cmd);
+ if (ret < 0)
+ return ret;
+
return scsi_cmd_ioctl(bd->bd_disk->queue, bd->bd_disk, mode, cmd, arg);
}
EXPORT_SYMBOL(scsi_cmd_blk_ioctl);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 2dd1b73..fd8145f 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -817,6 +817,10 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,
SCSI_LOG_IOCTL(1, printk("sd_ioctl: disk=%s, cmd=0x%x\n",
disk->disk_name, cmd));
+ error = scsi_verify_blk_ioctl(bdev, cmd);
+ if (error < 0)
+ return error;
+
/*
* If we are in the middle of error recovery, don't let anyone
* else try and use this device. Also, if error recovery fails, it
@@ -996,6 +1000,11 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
unsigned int cmd, unsigned long arg)
{
struct scsi_device *sdev = scsi_disk(bdev->bd_disk)->device;
+ int ret;
+
+ ret = scsi_verify_blk_ioctl(bdev, cmd);
+ if (ret < 0)
+ return ret;
/*
* If we are in the middle of error recovery, don't let anyone
@@ -1007,8 +1016,6 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
return -ENODEV;
if (sdev->host->hostt->compat_ioctl) {
- int ret;
-
ret = sdev->host->hostt->compat_ioctl(sdev, cmd, (void __user *)arg);
return ret;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 63070ad..5eb6cb0 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -777,6 +777,7 @@ extern void blk_plug_device(struct request_queue *);
extern void blk_plug_device_unlocked(struct request_queue *);
extern int blk_remove_plug(struct request_queue *);
extern void blk_recount_segments(struct request_queue *, struct bio *);
+extern int scsi_verify_blk_ioctl(struct block_device *, unsigned int);
extern int scsi_cmd_blk_ioctl(struct block_device *, fmode_t,
unsigned int, void __user *);
extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
--
1.7.8.2
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices
2012-01-17 4:07 ` [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices Ben Hutchings
@ 2012-01-17 9:55 ` Paolo Bonzini
2012-01-18 4:47 ` Ben Hutchings
0 siblings, 1 reply; 15+ messages in thread
From: Paolo Bonzini @ 2012-01-17 9:55 UTC (permalink / raw)
To: Ben Hutchings
Cc: stable, Linus Torvalds, linux-kernel, Petr Matousek, linux-scsi,
Jens Axboe, James Bottomley
On 01/17/2012 05:07 AM, Ben Hutchings wrote:
> Signed-off-by: Linus Torvalds<torvalds@linux-foundation.org>
> [bwh: Backport to 2.6.32 - ENOIOCTLCMD does not get converted to
> ENOTTY, so we must return ENOTTY directly]
> Signed-off-by: Ben Hutchings<ben@decadent.org.uk>
Have you tested 32-on-64? I already did this change in the version for
3.2 stable, but sd_compat_ioctl has to keep ENOIOCTLCMD:
> [ Cherry picked from 3ed4e7ba4be8c72051d87dcb2dec279d97a18d41
>
> Changes with respect to 3.3: return -ENOTTY from scsi_verify_blk_ioctl
> and -ENOIOCTLCMD from sd_compat_ioctl. ]
Paolo
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices
2012-01-17 9:55 ` Paolo Bonzini
@ 2012-01-18 4:47 ` Ben Hutchings
2012-01-18 9:00 ` Paolo Bonzini
0 siblings, 1 reply; 15+ messages in thread
From: Ben Hutchings @ 2012-01-18 4:47 UTC (permalink / raw)
To: Paolo Bonzini
Cc: stable, Linus Torvalds, linux-kernel, Petr Matousek, linux-scsi,
Jens Axboe, James Bottomley
[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]
On Tue, 2012-01-17 at 10:55 +0100, Paolo Bonzini wrote:
> On 01/17/2012 05:07 AM, Ben Hutchings wrote:
> > Signed-off-by: Linus Torvalds<torvalds@linux-foundation.org>
> > [bwh: Backport to 2.6.32 - ENOIOCTLCMD does not get converted to
> > ENOTTY, so we must return ENOTTY directly]
> > Signed-off-by: Ben Hutchings<ben@decadent.org.uk>
>
> Have you tested 32-on-64? I already did this change in the version for
> 3.2 stable, but sd_compat_ioctl has to keep ENOIOCTLCMD:
Not specifically...
> > [ Cherry picked from 3ed4e7ba4be8c72051d87dcb2dec279d97a18d41
> >
> > Changes with respect to 3.3: return -ENOTTY from scsi_verify_blk_ioctl
> > and -ENOIOCTLCMD from sd_compat_ioctl. ]
But in 2.6.32, compat_sys_ioctl will end up returning EINVAL rather than
ENOTTY for an unhandled ioctl number. Also, since we're denying ioctls
for security reasons rather than because we don't know how to handle
them, I don't think there's any harm in doing this.
Ben.
--
Ben Hutchings
When in doubt, use brute force. - Ken Thompson
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices
2012-01-18 4:47 ` Ben Hutchings
@ 2012-01-18 9:00 ` Paolo Bonzini
2012-01-18 16:04 ` Ben Hutchings
0 siblings, 1 reply; 15+ messages in thread
From: Paolo Bonzini @ 2012-01-18 9:00 UTC (permalink / raw)
To: Ben Hutchings
Cc: stable, Linus Torvalds, linux-kernel, Petr Matousek, linux-scsi,
Jens Axboe, James Bottomley
On 01/18/2012 05:47 AM, Ben Hutchings wrote:
> > Changes with respect to 3.3: return -ENOTTY from scsi_verify_blk_ioctl
> > and -ENOIOCTLCMD from sd_compat_ioctl. ]
>
> But in 2.6.32, compat_sys_ioctl will end up returning EINVAL rather than
> ENOTTY for an unhandled ioctl number.
No, it won't. The ioctl will percolate up the non-compat path and then
sd_ioctl will return ENOTTY.
> Also, since we're denying ioctls
> for security reasons rather than because we don't know how to handle
> them, I don't think there's any harm in doing this.
There is harm. You'll be blacklisting also the standard block device
ioctls, and those won't work on 32-on-64 anymore. A system with 32-bit
userland will likely not boot anymore. This is also somewhat exchanged
in my original exchange with Linus.
Paolo
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices
2012-01-18 9:00 ` Paolo Bonzini
@ 2012-01-18 16:04 ` Ben Hutchings
2012-01-24 12:56 ` Paolo Bonzini
0 siblings, 1 reply; 15+ messages in thread
From: Ben Hutchings @ 2012-01-18 16:04 UTC (permalink / raw)
To: Paolo Bonzini
Cc: stable, Linus Torvalds, linux-kernel, Petr Matousek, linux-scsi,
Jens Axboe, James Bottomley
[-- Attachment #1: Type: text/plain, Size: 1217 bytes --]
On Wed, 2012-01-18 at 10:00 +0100, Paolo Bonzini wrote:
> On 01/18/2012 05:47 AM, Ben Hutchings wrote:
> > > Changes with respect to 3.3: return -ENOTTY from scsi_verify_blk_ioctl
> > > and -ENOIOCTLCMD from sd_compat_ioctl. ]
> >
> > But in 2.6.32, compat_sys_ioctl will end up returning EINVAL rather than
> > ENOTTY for an unhandled ioctl number.
>
> No, it won't. The ioctl will percolate up the non-compat path and then
> sd_ioctl will return ENOTTY.
Ah, yes.
> > Also, since we're denying ioctls
> > for security reasons rather than because we don't know how to handle
> > them, I don't think there's any harm in doing this.
>
> There is harm. You'll be blacklisting also the standard block device
> ioctls, and those won't work on 32-on-64 anymore. A system with 32-bit
> userland will likely not boot anymore.
It does (yes, I tested that myself now). The standard block device
ioctls are handled without calling the driver's compat_ioctl.
> This is also somewhat exchanged in my original exchange with Linus.
Anyway, I agree that it is not necessary to differ from mainline here.
Ben.
--
Ben Hutchings
When in doubt, use brute force. - Ken Thompson
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices
2012-01-18 16:04 ` Ben Hutchings
@ 2012-01-24 12:56 ` Paolo Bonzini
2012-01-26 0:19 ` Greg KH
0 siblings, 1 reply; 15+ messages in thread
From: Paolo Bonzini @ 2012-01-24 12:56 UTC (permalink / raw)
To: Ben Hutchings
Cc: stable, Linus Torvalds, linux-kernel, Petr Matousek, linux-scsi,
Jens Axboe, James Bottomley
On 01/18/2012 05:04 PM, Ben Hutchings wrote:
> > There is harm. You'll be blacklisting also the standard block device
> > ioctls, and those won't work on 32-on-64 anymore. A system with 32-bit
> > userland will likely not boot anymore.
>
> It does (yes, I tested that myself now). The standard block device
> ioctls are handled without calling the driver's compat_ioctl.
What about the non-compat path when done by non-root?
* Does BLKROSET still return EACCES when run by non-root and without
CAP_SYS_ADMIN? I suspect your patch is changing it to EINVAL.
* Does BLKFLSBUF work when run by non-root but with CAP_SYS_ADMIN?
Paolo
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices
2012-01-24 12:56 ` Paolo Bonzini
@ 2012-01-26 0:19 ` Greg KH
2012-01-26 18:28 ` Greg KH
0 siblings, 1 reply; 15+ messages in thread
From: Greg KH @ 2012-01-26 0:19 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Ben Hutchings, stable, Linus Torvalds, linux-kernel,
Petr Matousek, linux-scsi, Jens Axboe, James Bottomley
On Tue, Jan 24, 2012 at 01:56:10PM +0100, Paolo Bonzini wrote:
> On 01/18/2012 05:04 PM, Ben Hutchings wrote:
> >> There is harm. You'll be blacklisting also the standard block device
> >> ioctls, and those won't work on 32-on-64 anymore. A system with 32-bit
> >> userland will likely not boot anymore.
> >
> >It does (yes, I tested that myself now). The standard block device
> >ioctls are handled without calling the driver's compat_ioctl.
>
> What about the non-compat path when done by non-root?
>
> * Does BLKROSET still return EACCES when run by non-root and without
> CAP_SYS_ADMIN? I suspect your patch is changing it to EINVAL.
>
> * Does BLKFLSBUF work when run by non-root but with CAP_SYS_ADMIN?
I'm confused here as well.
Can someone please send me the proper patch that I need to apply to
resolve this issue on the 2.6.32.y kernel?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices
2012-01-26 0:19 ` Greg KH
@ 2012-01-26 18:28 ` Greg KH
0 siblings, 0 replies; 15+ messages in thread
From: Greg KH @ 2012-01-26 18:28 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Ben Hutchings, stable, Linus Torvalds, linux-kernel,
Petr Matousek, linux-scsi, Jens Axboe, James Bottomley
On Wed, Jan 25, 2012 at 04:19:26PM -0800, Greg KH wrote:
> On Tue, Jan 24, 2012 at 01:56:10PM +0100, Paolo Bonzini wrote:
> > On 01/18/2012 05:04 PM, Ben Hutchings wrote:
> > >> There is harm. You'll be blacklisting also the standard block device
> > >> ioctls, and those won't work on 32-on-64 anymore. A system with 32-bit
> > >> userland will likely not boot anymore.
> > >
> > >It does (yes, I tested that myself now). The standard block device
> > >ioctls are handled without calling the driver's compat_ioctl.
> >
> > What about the non-compat path when done by non-root?
> >
> > * Does BLKROSET still return EACCES when run by non-root and without
> > CAP_SYS_ADMIN? I suspect your patch is changing it to EINVAL.
> >
> > * Does BLKFLSBUF work when run by non-root but with CAP_SYS_ADMIN?
>
> I'm confused here as well.
>
> Can someone please send me the proper patch that I need to apply to
> resolve this issue on the 2.6.32.y kernel?
Ok, I think I've queued up the correct ones, please let me know if I
messed something up.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH stable 4/4] dm: do not forward ioctls from logical volumes to the underlying device
2012-01-17 3:58 ` Ben Hutchings
` (2 preceding siblings ...)
2012-01-17 4:07 ` [PATCH stable 3/4] block: fail SCSI passthrough ioctls on partition devices Ben Hutchings
@ 2012-01-17 4:07 ` Ben Hutchings
3 siblings, 0 replies; 15+ messages in thread
From: Ben Hutchings @ 2012-01-17 4:07 UTC (permalink / raw)
To: stable
Cc: Paolo Bonzini, Linus Torvalds, linux-kernel, Petr Matousek,
linux-scsi, Jens Axboe, James Bottomley
From: Paolo Bonzini <pbonzini@redhat.com>
commit ec8013beddd717d1740cfefb1a9b900deef85462 upstream.
A logical volume can map to just part of underlying physical volume.
In this case, it must be treated like a partition.
Based on a patch from Alasdair G Kergon.
Cc: Alasdair G Kergon <agk@redhat.com>
Cc: dm-devel@redhat.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backport to 2.6.32 - drop change to drivers/md/dm-flakey.c]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
drivers/md/dm-linear.c | 12 +++++++++++-
drivers/md/dm-mpath.c | 6 ++++++
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 82f7d6e..7ab302d 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -116,7 +116,17 @@ static int linear_ioctl(struct dm_target *ti, unsigned int cmd,
unsigned long arg)
{
struct linear_c *lc = (struct linear_c *) ti->private;
- return __blkdev_driver_ioctl(lc->dev->bdev, lc->dev->mode, cmd, arg);
+ struct dm_dev *dev = lc->dev;
+ int r = 0;
+
+ /*
+ * Only pass ioctls through if the device sizes match exactly.
+ */
+ if (lc->start ||
+ ti->len != i_size_read(dev->bdev->bd_inode) >> SECTOR_SHIFT)
+ r = scsi_verify_blk_ioctl(NULL, cmd);
+
+ return r ? : __blkdev_driver_ioctl(dev->bdev, dev->mode, cmd, arg);
}
static int linear_merge(struct dm_target *ti, struct bvec_merge_data *bvm,
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index b03cd39..4ec5fe2 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -1464,6 +1464,12 @@ static int multipath_ioctl(struct dm_target *ti, unsigned int cmd,
spin_unlock_irqrestore(&m->lock, flags);
+ /*
+ * Only pass ioctls through if the device sizes match exactly.
+ */
+ if (!r && ti->len != i_size_read(bdev->bd_inode) >> SECTOR_SHIFT)
+ r = scsi_verify_blk_ioctl(NULL, cmd);
+
return r ? : __blkdev_driver_ioctl(bdev, mode, cmd, arg);
}
--
1.7.8.2
^ permalink raw reply related [flat|nested] 15+ messages in thread