Commit a25d4261 authored by Nick Bowler's avatar Nick Bowler Committed by Jens Axboe
Browse files

nvme: define compat_ioctl again to unbreak 32-bit userspace. 



Commit 89b3d6e6 ("nvme: simplify the compat ioctl handling") removed
the initialization of compat_ioctl from the nvme block_device_operations
structures.

Presumably the expectation was that 32-bit ioctls would be directed
through the regular handler but this is not the case: failing to assign
.compat_ioctl actually means that the compat case is disabled entirely,
and any attempt to submit nvme ioctls from 32-bit userspace fails
outright with -ENOTTY.

For example:

  % smartctl -x /dev/nvme0n1
  [...]
  Read NVMe Identify Controller failed: NVME_IOCTL_ADMIN_CMD: Inappropriate ioctl for device

The blkdev_compat_ptr_ioctl helper can be used to direct compat calls
through the main ioctl handler and makes things work again.

Fixes: 89b3d6e6 ("nvme: simplify the compat ioctl handling")
Signed-off-by: default avatarNick Bowler <nbowler@draconx.ca>
Reviewed-by: default avatarGuixin Liu <kanie@linux.alibaba.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent eb7e2d92

drivers/nvme/host/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2136,6 +2136,7 @@ static int nvme_report_zones(struct gendisk *disk, sector_t sector, 
static const struct block_device_operations nvme_bdev_ops = {

	.owner		= THIS_MODULE,

	.ioctl		= nvme_ioctl,

	.compat_ioctl	= blkdev_compat_ptr_ioctl,

	.open		= nvme_open,

	.release	= nvme_release,

	.getgeo		= nvme_getgeo,

drivers/nvme/host/multipath.c

+1 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ const struct block_device_operations nvme_ns_head_ops = { 
	.open		= nvme_ns_head_open,

	.release	= nvme_ns_head_release,

	.ioctl		= nvme_ns_head_ioctl,

	.compat_ioctl	= blkdev_compat_ptr_ioctl,

	.getgeo		= nvme_getgeo,

	.report_zones	= nvme_ns_head_report_zones,

	.pr_ops		= &nvme_pr_ops,