summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorPeilin Ye <yepeilin.cs@gmail.com>2020-10-02 10:22:23 -0400
committerJens Axboe <axboe@kernel.dk>2020-10-02 12:01:47 -0600
commit6d53a9fe5a1983490bc14b3a64d49fabb4ccc651 (patch)
tree696e521a32bfb23aa574e8aec1c27394e200a631 /block
parent632bfb6323799c087fcb4108dfe59518609667a7 (diff)
downloadlinux-6d53a9fe5a1983490bc14b3a64d49fabb4ccc651.tar.bz2
block/scsi-ioctl: Fix kernel-infoleak in scsi_put_cdrom_generic_arg()
scsi_put_cdrom_generic_arg() is copying uninitialized stack memory to userspace, since the compiler may leave a 3-byte hole in the middle of `cgc32`. Fix it by adding a padding field to `struct compat_cdrom_generic_command`. Cc: stable@vger.kernel.org Fixes: f3ee6e63a9df ("compat_ioctl: move CDROM_SEND_PACKET handling into scsi") Suggested-by: Dan Carpenter <dan.carpenter@oracle.com> Suggested-by: Arnd Bergmann <arnd@arndb.de> Reported-by: syzbot+85433a479a646a064ab3@syzkaller.appspotmail.com Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
-rw-r--r--block/scsi_ioctl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index ef722f04f88a..72108404718f 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -651,6 +651,7 @@ struct compat_cdrom_generic_command {
compat_int_t stat;
compat_caddr_t sense;
unsigned char data_direction;
+ unsigned char pad[3];
compat_int_t quiet;
compat_int_t timeout;
compat_caddr_t reserved[1];