diff options
| author | Alexander Potapenko <glider@google.com> | 2018-05-18 16:23:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-25 10:54:57 +0200 |
| commit | 58b7ce6f9ef2367f86384b20458642945993b816 (patch) | |
| tree | 234a8b4d35dae78560aa1e52babb0aedb4b09c6f | |
| parent | badf15c8a243ca1292b8034dea2f91cc01982010 (diff) | |
scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()
commit a45b599ad808c3c982fdcdc12b0b8611c2f92824 upstream.
This shall help avoid copying uninitialized memory to the userspace when
calling ioctl(fd, SG_IO) with an empty command.
Reported-by: syzbot+7d26fc1eea198488deab@syzkaller.appspotmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Alexander Potapenko <glider@google.com>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/scsi/sg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 726aef8210aa..a77a9e412552 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1950,7 +1950,7 @@ retry: num = (rem_sz > scatter_elem_sz_prev) ? scatter_elem_sz_prev : rem_sz; - schp->pages[k] = alloc_pages(gfp_mask, order); + schp->pages[k] = alloc_pages(gfp_mask | __GFP_ZERO, order); if (!schp->pages[k]) goto out; |