diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-01-22 16:49:20 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-01-22 16:49:57 +0700 |
| commit | 8a65ee9a2f9055ebc72e3a34206255129e3afb09 (patch) | |
| tree | 6cc78596a50734f52be0050972b2df36a5ea3be3 /block | |
| parent | eedcf0c3ff0ab70b3a3a2ae7d73dcf334ea3c34e (diff) | |
| parent | d4184347012fbe705671037a4a0e4c7021ea4329 (diff) | |
| download | kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.zip kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.tar.gz kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.tar.bz2 | |
Merge 3.0.60
Change-Id: I00b211aba537823b54ad68971ebb9032a6bf78f7
Diffstat (limited to 'block')
| -rw-r--r-- | block/scsi_ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 5ef1f4c..055952e 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -722,11 +722,14 @@ int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd) break; } + if (capable(CAP_SYS_RAWIO)) + return 0; + /* 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; + return -ENOTTY; } EXPORT_SYMBOL(scsi_verify_blk_ioctl); |