This is a note to let you know that I've just added the patch titled
loop: Check for overflow while configuring loop
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
loop-check-for-overflow-while-configuring-loop.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable+bounces-25719-greg=kroah.com@xxxxxxxxxxxxxxx Fri Mar 1 02:48:58 2024
From: Genjian <zhanggenjian@xxxxxxx>
Date: Fri, 1 Mar 2024 09:30:27 +0800
Subject: loop: Check for overflow while configuring loop
To: stable@xxxxxxxxxxxxxxx
Cc: axboe@xxxxxxxxx, stable@xxxxxxxxxx, linux-block@xxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, zhanggenjian123@xxxxxxxxx, Siddh Raman Pant <code@xxxxxxxx>, syzbot+a8e049cd3abd342936b6@xxxxxxxxxxxxxxxxxxxxxxxxx, Matthew Wilcox <willy@xxxxxxxxxxxxx>, Christoph Hellwig <hch@xxxxxx>, Genjian Zhang <zhanggenjian@xxxxxxxxxx>
Message-ID: <20240301013028.2293831-9-zhanggenjian@xxxxxxx>
From: Siddh Raman Pant <code@xxxxxxxx>
[ Upstream commit c490a0b5a4f36da3918181a8acdc6991d967c5f3 ]
The userspace can configure a loop using an ioctl call, wherein
a configuration of type loop_config is passed (see lo_ioctl()'s
case on line 1550 of drivers/block/loop.c). This proceeds to call
loop_configure() which in turn calls loop_set_status_from_info()
(see line 1050 of loop.c), passing &config->info which is of type
loop_info64*. This function then sets the appropriate values, like
the offset.
loop_device has lo_offset of type loff_t (see line 52 of loop.c),
which is typdef-chained to long long, whereas loop_info64 has
lo_offset of type __u64 (see line 56 of include/uapi/linux/loop.h).
The function directly copies offset from info to the device as
follows (See line 980 of loop.c):
lo->lo_offset = info->lo_offset;
This results in an overflow, which triggers a warning in iomap_iter()
due to a call to iomap_iter_done() which has:
WARN_ON_ONCE(iter->iomap.offset > iter->pos);
Thus, check for negative value during loop_set_status_from_info().
Bug report: https://syzkaller.appspot.com/bug?id=c620fe14aac810396d3c3edc9ad73848bf69a29e
Reported-and-tested-by: syzbot+a8e049cd3abd342936b6@xxxxxxxxxxxxxxxxxxxxxxxxx
Cc: stable@xxxxxxxxxxxxxxx
Reviewed-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Signed-off-by: Siddh Raman Pant <code@xxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Link: https://lore.kernel.org/r/20220823160810.181275-1-code@xxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Genjian Zhang <zhanggenjian@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/block/loop.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1271,6 +1271,11 @@ loop_set_status_from_info(struct loop_de
lo->lo_offset = info->lo_offset;
lo->lo_sizelimit = info->lo_sizelimit;
+
+ /* loff_t vars have been assigned __u64 */
+ if (lo->lo_offset < 0 || lo->lo_sizelimit < 0)
+ return -EOVERFLOW;
+
memcpy(lo->lo_file_name, info->lo_file_name, LO_NAME_SIZE);
memcpy(lo->lo_crypt_name, info->lo_crypt_name, LO_NAME_SIZE);
lo->lo_file_name[LO_NAME_SIZE-1] = 0;
Patches currently in stable-queue which might be from kroah.com@xxxxxxxxxxxxxxx are
queue-4.19/loop-factor-out-configuring-loop-from-status.patch
queue-4.19/loop-call-loop_config_discard-only-after-new-config-is-applied.patch
queue-4.19/loop-refactor-loop_set_status-size-calculation.patch
queue-4.19/loop-factor-out-setting-loop-device-size.patch
queue-4.19/loop-check-for-overflow-while-configuring-loop.patch
queue-4.19/loop-properly-observe-rotational-flag-of-underlying-device.patch
queue-4.19/loop-remove-sector_t-truncation-checks.patch
queue-4.19/revert-loop-check-for-overflow-while-configuring-loop.patch
queue-4.19/loop-loop_set_status_from_info-check-before-assignment.patch
