summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorCarlos Llamas <cmllamas@google.com>2022-03-29 23:18:15 +0300
committerJens Axboe <axboe@kernel.dk>2022-03-30 17:54:32 +0300
commitf941c51eeac7ebe0f8ec30943bf78e7f60aad039 (patch)
treed39cb8cab63c284cb6db354b1d9606a243a6a411 /drivers/block
parent1e06b3e71e07e0dd8801edc4f26ea1411d1d34c2 (diff)
downloadlinux-f941c51eeac7ebe0f8ec30943bf78e7f60aad039.tar.xz
loop: fix ioctl calls using compat_loop_info
Support for cryptoloop was deleted in commit 47e9624616c8 ("block: remove support for cryptoloop and the xor transfer"), making the usage of loop_info->lo_encrypt_type obsolete. However, this member was also removed from the compat_loop_info definition and this breaks userspace ioctl calls for 32-bit binaries and CONFIG_COMPAT=y. This patch restores the compat_loop_info->lo_encrypt_type member and marks it obsolete as well as in the uapi header definitions. Fixes: 47e9624616c8 ("block: remove support for cryptoloop and the xor transfer") Signed-off-by: Carlos Llamas <cmllamas@google.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20220329201815.1347500-1-cmllamas@google.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/loop.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index e733c48de2e9..39e7650f89b1 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1592,6 +1592,7 @@ struct compat_loop_info {
compat_ulong_t lo_inode; /* ioctl r/o */
compat_dev_t lo_rdevice; /* ioctl r/o */
compat_int_t lo_offset;
+ compat_int_t lo_encrypt_type; /* obsolete, ignored */
compat_int_t lo_encrypt_key_size; /* ioctl w/o */
compat_int_t lo_flags; /* ioctl r/o */
char lo_name[LO_NAME_SIZE];