Merge tag 'auxdisplay-6.3' of https://github.com/ojeda/linux

torvalds · torvalds · commit 6972633c58fd · 2023-03-02T09:37:58.000-08:00
Pull auxdisplay fix from Miguel Ojeda: - hd44780: Fix potential memory leak in hd44780_remove() (Jianglei Nie) * tag 'auxdisplay-6.3' of https://github.com/ojeda/linux: auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()
diff --git a/drivers/auxdisplay/hd44780.c b/drivers/auxdisplay/hd44780.c
@@ -322,8 +322,10 @@ static int hd44780_probe(struct platform_device *pdev)
 static int hd44780_remove(struct platform_device *pdev)
 {
 	struct charlcd *lcd = platform_get_drvdata(pdev);
+	struct hd44780_common *hdc = lcd->drvdata;
 
 	charlcd_unregister(lcd);
+	kfree(hdc->hd44780);
 	kfree(lcd->drvdata);
 
 	kfree(lcd);

Original file line number	Diff line number	Diff line change
`@@ -322,8 +322,10 @@ static int hd44780_probe(struct platform_device *pdev)`
`322`	`322`	`static int hd44780_remove(struct platform_device *pdev)`
`323`	`323`	`{`
`324`	`324`	`struct charlcd *lcd = platform_get_drvdata(pdev);`
	`325`	`+ struct hd44780_common *hdc = lcd->drvdata;`
`325`	`326`
`326`	`327`	`charlcd_unregister(lcd);`
	`328`	`+ kfree(hdc->hd44780);`
`327`	`329`	`kfree(lcd->drvdata);`
`328`	`330`
`329`	`331`	`kfree(lcd);`