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 Acked-by: Al Viro --- commit 844f68d0f8b098a80ccd6802c38daa7db05e00bd tree 821049ac4ae8c959b67fab0ef8589007d6c8d048 parent ca3b9a7031878ad74f53734caba806a2ece34486 author Stephen Tweedie Tue, 17 May 2005 18:30:49 +0100 committer Stephen Tweedie Tue, 17 May 2005 18:30:49 +0100 char/raw.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: drivers/char/raw.c =================================================================== --- 9cbd94d6df022eeb8f467da9ad5b7ed2c6843a96/drivers/char/raw.c (mode:100644) +++ 821049ac4ae8c959b67fab0ef8589007d6c8d048/drivers/char/raw.c (mode:100644) @@ -122,7 +122,7 @@ { 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)