Skip to contentSkip to conversation

raid1: fix incorrect page freeing in alloc_behind_master_bio

PATCH In review Christoph Hellwig 2 participants 2 messages Jun 5, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 raid1: fix incorrect page freeing in alloc_behind_master_bio

free_page takes the virtual address of the memory to be freed, and does so as an unsigned long just to make things confusing. Use put_page instead, which actually works on the page pointer.

Note that this is a reason why this should have used __bio_add_page instead for this impossible to hit case..

Fixes 2f9848178cfa ("md: raid1: use __bio_add_page for adding single page to bio")
---
 drivers/md/raid1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/raid1.c +1 -1
index ff89839455ec11..3570da63969b58 100644
@@ -1148,7 +1148,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio,
 			goto free_pages;
 
 		if (!bio_add_page(behind_bio, page, len, 0)) {
-			free_page(page);
+			put_page(page);
 			goto free_pages;
 		}
 
Signature · 1 line
2.39.2
#1 lore raw
Quoted 18 lines · Christoph Hellwig

free_page takes the virtual address of the memory to be freed, and does so as an unsigned long just to make things confusing. Use put_page instead, which actually works on the page pointer.

Note that this is a reason why this should have used __bio_add_page instead for this impossible to hit case..

Fixes 2f9848178cfa ("md: raid1: use __bio_add_page for adding single page to bio")
---
 drivers/md/raid1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/raid1.c +0 -0
index ff89839455ec11..3570da63969b58 100644

drivers/md/raid1.c static void alloc_behind_master_bio(struct r1bio *r1_bio, · line 1154

Quoted 8 lines
drivers/md/raid1.c +1 -1
@@ -1148,7 +1148,7 @@ static void alloc_behind_master_bio(struct r1bio *r1_bio,
 			goto free_pages;
 
 		if (!bio_add_page(behind_bio, page, len, 0)) {
-			free_page(page);
+			put_page(page);
 			goto free_pages;
 		}
 

That should already be fixed in Jens' tree.