Il 23/07/2012 03:07, Ben Hutchings ha scritto: > 3.2-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Jan Kara <j...@suse.cz> > > commit 6d9359280753d2955f86d6411047516a9431eb51 upstream. > > Sometimes, warnings about ioctls to partition happen often enough that they > form majority of the warnings in the kernel log and users complain. In some > cases warnings are about ioctls such as SG_IO so it's not good to get rid of > the warnings completely as they can ease debugging of userspace problems > when ioctl is refused. > > Since I have seen warnings from lots of commands, including some proprietary > userspace applications, I don't think disallowing the ioctls for processes > with CAP_SYS_RAWIO will happen in the near future if ever. So lets just > stop warning for processes with CAP_SYS_RAWIO for which ioctl is allowed. > > CC: Paolo Bonzini <pbonz...@redhat.com> > CC: James Bottomley <jbottom...@parallels.com> > CC: linux-s...@vger.kernel.org > Acked-by: Paolo Bonzini <pbonz...@redhat.com> > Signed-off-by: Jan Kara <j...@suse.cz> > Signed-off-by: Jens Axboe <ax...@kernel.dk> > [bwh: Backported to 3.2: use ENOTTY, not ENOIOCTLCMD] > Signed-off-by: Ben Hutchings <b...@decadent.org.uk> > --- > block/scsi_ioctl.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > --- a/block/scsi_ioctl.c > +++ b/block/scsi_ioctl.c > @@ -721,11 +721,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;
Here was the conflict, and you fixed it correctly. Reviewed-by: Paolo Bonzini <pbonz...@redhat.com> > } > EXPORT_SYMBOL(scsi_verify_blk_ioctl); > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
