nvme: define compat_ioctl again to unbreak 32-bit userspace.
authorNick Bowler <nbowler@draconx.ca>
Thu, 21 Jul 2022 03:57:35 +0000 (23:57 -0400)
committerChristoph Hellwig <hch@lst.de>
Tue, 26 Jul 2022 20:04:19 +0000 (16:04 -0400)
commite83bf5419c4d9b6d4b25b259c074ddcf78a69caa
tree2f85cda7595ae4a9e0d314f9fea8cc55914e798a
parent5d3c8d88c6b36e28385d49f1fef8f8385e3b0390
nvme: define compat_ioctl again to unbreak 32-bit userspace.

Commit 89b3d6e60550 ("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: 89b3d6e60550 ("nvme: simplify the compat ioctl handling")
Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Reviewed-by: Guixin Liu <kanie@linux.alibaba.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/core.c
drivers/nvme/host/multipath.c