From b253ac1c874e3fa28ffbd41a724420a784c9062d Mon Sep 17 00:00:00 2001 From: Haimin Zhang Date: Thu, 24 Mar 2022 04:19:05 +0000 Subject: [PATCH] block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern mainline inclusion from mainline-v5.17-rc5 commit cc8f7fe1f5eab010191aa4570f27641876fa1267 category: bugfix bugzilla: 186474, https://gitee.com/openeuler/kernel/issues/I4Z2LA CVE: CVE-2022-0494 -------------------------------- Add __GFP_ZERO flag for alloc_page in function bio_copy_kern to initialize the buffer of a bio. Signed-off-by: Haimin Zhang Reviewed-by: Chaitanya Kulkarni Reviewed-by: Christoph Hellwig Link: https://lore.kernel.org/r/20220216084038.15635-1-tcs.kernel@gmail.com Signed-off-by: Jens Axboe Conflict: commit ce288e053568 ("block: remove BLK_BOUNCE_ISA support") is not backported. Signed-off-by: Yu Kuai Reviewed-by: Jason Yan Reviewed-by: Xiu Jianfeng Signed-off-by: Yongqiang Liu --- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bio.c b/block/bio.c index b50d3b59c79b..6457cbfa70cc 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1528,7 +1528,7 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, if (bytes > len) bytes = len; - page = alloc_page(q->bounce_gfp | gfp_mask); + page = alloc_page(q->bounce_gfp | __GFP_ZERO | gfp_mask); if (!page) goto cleanup; -- GitLab