| Message ID | 20200426130728.63399-4-efremov@linux.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | floppy: suppress UBSAN warning in setup_rw_floppy() | expand |
On Sun, 2020-04-26 at 16:07 +0300, Denis Efremov wrote: > UBSAN: array-index-out-of-bounds in drivers/block/floppy.c:1521:45 > index 16 is out of range for type 'unsigned char [16]' [] > This out-of-bounds access is intentional. The command in struct > floppy_raw_cmd may take up the space initially intended for the reply > and the reply count. It is needed for long 82078 commands such as > RESTORE, which takes 17 command bytes. Initial cmd size is not enough > and since struct setup_rw_floppy is a part of uapi we check that > cmd_count is in [0:16+1+16] in raw_cmd_copyin(). > > The patch adds union with original cmd,reply_count,reply fields and > fullcmd field of equivalent size. The cmd accesses are turned to > fullcmd where appropriate to suppress UBSAN warning. [] > diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c [] > @@ -1072,7 +1072,7 @@ static void setup_DMA(void) > > pr_info("zero dma transfer size:"); > for (i = 0; i < raw_cmd->cmd_count; i++) > - pr_cont("%x,", raw_cmd->cmd[i]); > + pr_cont("%x,", raw_cmd->fullcmd[i]); > pr_cont("\n"); slightly unrelated trivia: perhaps better as: print_hex_dump(KERN_INFO, "zero dma transfer size: ", DUMP_PREFIX_NONE, 16, 1, raw_cmd->fullcmd, raw_cmd->cmd_count, false); to avoid pr_cont use.
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 052ba457956e..1b22aab6cd9b 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -1072,7 +1072,7 @@ static void setup_DMA(void) pr_info("zero dma transfer size:"); for (i = 0; i < raw_cmd->cmd_count; i++) - pr_cont("%x,", raw_cmd->cmd[i]); + pr_cont("%x,", raw_cmd->fullcmd[i]); pr_cont("\n"); cont->done(0); fdc_state[current_fdc].reset = 1; @@ -1518,7 +1518,7 @@ static void setup_rw_floppy(void) r = 0; for (i = 0; i < raw_cmd->cmd_count; i++) - r |= output_byte(current_fdc, raw_cmd->cmd[i]); + r |= output_byte(current_fdc, raw_cmd->fullcmd[i]); debugt(__func__, "rw_command"); diff --git a/include/uapi/linux/fd.h b/include/uapi/linux/fd.h index 2e9c2c1c18e6..8b80c63b971c 100644 --- a/include/uapi/linux/fd.h +++ b/include/uapi/linux/fd.h @@ -371,9 +371,14 @@ struct floppy_raw_cmd { */ unsigned char cmd_count; - unsigned char cmd[FD_RAW_CMD_SIZE]; - unsigned char reply_count; - unsigned char reply[FD_RAW_REPLY_SIZE]; + union { + struct { + unsigned char cmd[FD_RAW_CMD_SIZE]; + unsigned char reply_count; + unsigned char reply[FD_RAW_REPLY_SIZE]; + }; + unsigned char fullcmd[FD_RAW_CMD_FULLSIZE]; + }; int track; int resultcode;
UBSAN: array-index-out-of-bounds in drivers/block/floppy.c:1521:45 index 16 is out of range for type 'unsigned char [16]' Call Trace: ... setup_rw_floppy+0x5c3/0x7f0 floppy_ready+0x2be/0x13b0 process_one_work+0x2c1/0x5d0 worker_thread+0x56/0x5e0 kthread+0x122/0x170 ret_from_fork+0x35/0x40 From include/uapi/linux/fd.h: struct floppy_raw_cmd { ... unsigned char cmd_count; unsigned char cmd[16]; unsigned char reply_count; unsigned char reply[16]; ... } This out-of-bounds access is intentional. The command in struct floppy_raw_cmd may take up the space initially intended for the reply and the reply count. It is needed for long 82078 commands such as RESTORE, which takes 17 command bytes. Initial cmd size is not enough and since struct setup_rw_floppy is a part of uapi we check that cmd_count is in [0:16+1+16] in raw_cmd_copyin(). The patch adds union with original cmd,reply_count,reply fields and fullcmd field of equivalent size. The cmd accesses are turned to fullcmd where appropriate to suppress UBSAN warning. Signed-off-by: Denis Efremov <efremov@linux.com> --- drivers/block/floppy.c | 4 ++-- include/uapi/linux/fd.h | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-)