Skip to contentSkip to conversation

scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()

PATCH Applied Alexander Potapenko 3 participants 3 messages May 18, 2018

Subsystems (3)
Stable branch SCSI SCSI SG driver
lore
Share & tools
lore

Alexander Potapenko

author
#0 lore raw

PATCH 1/1 scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()

This shall help avoid copying uninitialized memory to the userspace when calling ioctl(fd, SG_IO) with an empty command.

Reported-by [email protected]
Cc [email protected]
Signed-off-by Alexander Potapenko <[email protected]>
Acked-by Douglas Gilbert <[email protected]>
Reviewed-by Johannes Thumshirn <[email protected]>
---
 drivers/scsi/sg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/sg.c +1 -1
index c198b96368dd..5c40d809830f 100644
@@ -1894,7 +1894,7 @@ sg_build_indirect(Sg_scatter_hold * schp, Sg_fd * sfp, int buff_size)
 		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;
Signature · 1 line
2.17.0.441.gb46fe60e1d-goog
Applied
#1 lore raw

Alexander,

Quoted 2 lines

This shall help avoid copying uninitialized memory to the userspace when calling ioctl(fd, SG_IO) with an empty command.

Applied to 4.17/scsi-fixes. Thank you!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering