fbdev: savage: fix probe-path EDID cleanup leaks
Subsystems (2)
PATCH 1/1 fbdev: savage: fix probe-path EDID cleanup leaks
When CONFIG_FB_SAVAGE_I2C is enabled, savagefb_probe() can build both an EDID-derived monspecs.modedb and a modelist from it before later failing.
The normal success path frees monspecs.modedb after the initial mode selection, but the probe error path only deletes the I2C busses and misses the EDID-derived allocations.
Free both the modelist and monspecs.modedb on the failed: unwind path.
--- drivers/video/fbdev/savage/savagefb_driver.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/savage/savagefb_driver.c +2 -0
@@ -2322,6 +2322,8 @@ static int savagefb_probe(struct pci_dev *dev, const struct pci_device_id *id) failed: #ifdef CONFIG_FB_SAVAGE_I2Csavagefb_delete_i2c_busses (info ); +fb_destroy_modelist (&info->modelist); +fb_destroy_modedb (info->monspecs.modedb);#endif fb_alloc_cmap (&info->cmap,0 ,0 );savage_unmap_video (info);
Signature · 1 line
2.50.1 (Apple Git-155)
Dear Antonino and Helge,
I am sending a gentle ping on this patch. Please let me know if you have any feedback or if any changes are needed.
Best regards,
Yuho
Quoted 38 lines · Yuho Choi
When
CONFIG_FB_SAVAGE_I2Cis enabled,savagefb_probe()can build both an EDID-derived monspecs.modedb and a modelist from it before later failing.The normal success path frees monspecs.modedb after the initial mode selection, but the probe error path only deletes the I2C busses and misses the EDID-derived allocations.
Free both the modelist and monspecs.modedb on the failed: unwind path.
Co-developed-by Myeonghun Pak <[email protected]>Signed-off-by Myeonghun Pak <[email protected]>Co-developed-by Ijae Kim <[email protected]>Signed-off-by Ijae Kim <[email protected]>Co-developed-by Taegyu Kim <[email protected]>Signed-off-by Taegyu Kim <[email protected]>Signed-off-by Yuho Choi <[email protected]>--- drivers/video/fbdev/savage/savagefb_driver.c | 2 ++ 1 file changed, 2 insertions(+)drivers/video/fbdev/savage/savagefb_driver.c +2
-1@@ -2322,6 +2322,8 @@ static int savagefb_probe(struct pci_dev *dev, const struct pci_device_id *id) failed: #ifdef CONFIG_FB_SAVAGE_I2Csavagefb_delete_i2c_busses (info ); +fb_destroy_modelist (&info->modelist); +fb_destroy_modedb (info->monspecs.modedb);#endif fb_alloc_cmap (&info->cmap,0 ,0 );savage_unmap_video (info); --2.50.1 (Apple Git-155)
PATCH 1/1 fbdev: savage: fix probe-path EDID cleanup leaks
In reply to Yuho ChoiHi Antonino and Helge,
I am sending a gentle ping on this patch. Please let me know if you have any feedback or if any changes are needed.
Best regards,
Yuho Choi