iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: xgifb: fix some memory leaks

Browse Source 
Some xgifb_probe() error paths are missing proper vfree()s. Move them
all into a single place.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Aaro Koskinen 2011-02-17 23:29:12 +02:00 committed by Greg Kroah-Hartman
parent bb29223453
commit 6af8172043
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/xgifb/XGI_main_26.c
View File

@ -3065,7 +3065,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
XGIhw_ext.pCR = vmalloc(sizeof(struct XGI_DSReg) * CR_BUFFER_SIZE); XGIhw_ext.pCR = vmalloc(sizeof(struct XGI_DSReg) * CR_BUFFER_SIZE);
if (XGIhw_ext.pCR == NULL) { if (XGIhw_ext.pCR == NULL) {
vfree(XGIhw_ext.pSR);
printk(KERN_ERR "XGIfb: Fatal error: Allocating CRReg space failed.\n"); printk(KERN_ERR "XGIfb: Fatal error: Allocating CRReg space failed.\n");
ret = -ENODEV; ret = -ENODEV;
goto error; goto error;
@ -3105,8 +3104,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
} }
#endif #endif
if (XGIfb_get_dram_size()) { if (XGIfb_get_dram_size()) {
vfree(XGIhw_ext.pSR);
vfree(XGIhw_ext.pCR);
printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n"); printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n");
ret = -ENODEV; ret = -ENODEV;
goto error; goto error;
@ -3125,8 +3122,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
printk("unable request memory size %x", xgi_video_info.video_size); printk("unable request memory size %x", xgi_video_info.video_size);
printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve frame buffer memory\n"); printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve frame buffer memory\n");
printk(KERN_ERR "XGIfb: Is there another framebuffer driver active?\n"); printk(KERN_ERR "XGIfb: Is there another framebuffer driver active?\n");
vfree(XGIhw_ext.pSR);
vfree(XGIhw_ext.pCR);
ret = -ENODEV; ret = -ENODEV;
goto error; goto error;
} }
@ -3134,8 +3129,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
if (!request_mem_region(xgi_video_info.mmio_base, XGIfb_mmio_size, "XGIfb MMIO")) { if (!request_mem_region(xgi_video_info.mmio_base, XGIfb_mmio_size, "XGIfb MMIO")) {
printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve MMIO region\n"); printk(KERN_ERR "XGIfb: Fatal error: Unable to reserve MMIO region\n");
release_mem_region(xgi_video_info.video_base, xgi_video_info.video_size); release_mem_region(xgi_video_info.video_base, xgi_video_info.video_size);
vfree(XGIhw_ext.pSR);
vfree(XGIhw_ext.pCR);
ret = -ENODEV; ret = -ENODEV;
goto error; goto error;
} }
@ -3441,6 +3434,8 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
return 0; return 0;
error: error:
vfree(XGIhw_ext.pSR);
vfree(XGIhw_ext.pCR);
framebuffer_release(fb_info); framebuffer_release(fb_info);
return ret; return ret;
} }