Skip to contentSkip to conversation

char: hpet: Fix out-of-bounds read bug

PATCH New Gustavo A. R. Silva 1 participant 1 message Jan 29, 2020

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

PATCH 1/1 char: hpet: Fix out-of-bounds read bug

Currently, there is an out-of-bounds read on array hpetp->hp_dev in the following for loop:

870 for (i = 0; i < hdp->hd_nirqs; i++)
871 hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i];

This is due to the recent change from one-element array to flexible-array member in struct hpets:

104 struct hpets {
	...

113 struct hpet_dev hp_dev[];
114 };

This change affected the total size of the dynamic memory allocation, decreasing it by one time the size of struct hpet_dev.

Fix this by adjusting the allocation size when calling struct_size().

Fixes 987f028b8637c ("char: hpet: Use flexible-array member")

---

Here to fix what I break. :p Sorry...

 drivers/char/hpet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/hpet.c +1 -1
index aed2c45f7968..ed3b7dab678d 100644
@@ -855,7 +855,7 @@ int hpet_alloc(struct hpet_data *hdp)
 		return 0;
 	}
 
-	hpetp = kzalloc(struct_size(hpetp, hp_dev, hdp->hd_nirqs - 1),
+	hpetp = kzalloc(struct_size(hpetp, hp_dev, hdp->hd_nirqs),
 			GFP_KERNEL);
 
 	if (!hpetp)
Signature · 1 line
2.23.0