[PATCH] Fix filp being passed through raw ioctl handler
Don't pass meaningless file handles to block device ioctls. The recent raw IO ioctl-passthrough fix started passing the raw file handle into the block device ioctl handler. That's unlikely to be useful, as the file handle is actually open on a character-mode raw device, not a block device, so dereferencing it is not going to yield useful results to a block device ioctl handler. Previously we just passed NULL; also not a value that can usefully be dereferenced, but at least if it does happen, we'll oops instead of silently pretending that the file is a block device, so NULL is the more defensive option here. This patch reverts to that behaviour. Noticed by Al Viro. Signed-off-by: Stephen Tweedie <sct@redhat.com> Acked-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
d1ded203ad
commit
e72022e13d
|
@ -122,7 +122,7 @@ raw_ioctl(struct inode *inode, struct file *filp,
|
|||
{
|
||||
struct block_device *bdev = filp->private_data;
|
||||
|
||||
return blkdev_ioctl(bdev->bd_inode, filp, command, arg);
|
||||
return blkdev_ioctl(bdev->bd_inode, NULL, command, arg);
|
||||
}
|
||||
|
||||
static void bind_device(struct raw_config_request *rq)
|
||||
|
|
Loading…
Reference in New Issue