Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

asiliantfb: fix cmap memory leaks

Browse Source 
- fix cmap leak in removal path
 - fix cmap leak when register_framebuffer fails
 - check return value of fb_alloc_cmap
 - don't continue with driver setup if register_framebuffer fails

[krzysztof.h1@wp.pl: spotted missing iounmap]
[randy.dunlap@oracle.com: move data declaration before any code]
Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andres Salomon 2009-03-31 15:25:33 -07:00 committed by Linus Torvalds
parent ba78289343
commit 032220ba31
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/video/asiliantfb.c
View File

@ -505,19 +505,27 @@ static struct fb_var_screeninfo asiliantfb_var __devinitdata = {
.vsync_len = 2, .vsync_len = 2,
}; };
static void __devinit init_asiliant(struct fb_info *p, unsigned long addr) static int __devinit init_asiliant(struct fb_info *p, unsigned long addr)
{ {
int err;
p->fix = asiliantfb_fix; p->fix = asiliantfb_fix;
p->fix.smem_start = addr; p->fix.smem_start = addr;
p->var = asiliantfb_var; p->var = asiliantfb_var;
p->fbops = &asiliantfb_ops; p->fbops = &asiliantfb_ops;
p->flags = FBINFO_DEFAULT; p->flags = FBINFO_DEFAULT;
fb_alloc_cmap(&p->cmap, 256, 0); err = fb_alloc_cmap(&p->cmap, 256, 0);
if (err) {
printk(KERN_ERR "C&T 69000 fb failed to alloc cmap memory\n");
return err;
}
if (register_framebuffer(p) < 0) { err = register_framebuffer(p);
if (err < 0) {
printk(KERN_ERR "C&T 69000 framebuffer failed to register\n"); printk(KERN_ERR "C&T 69000 framebuffer failed to register\n");
return; fb_dealloc_cmap(&p->cmap);
return err;
} }
printk(KERN_INFO "fb%d: Asiliant 69000 frame buffer (%dK RAM detected)\n", printk(KERN_INFO "fb%d: Asiliant 69000 frame buffer (%dK RAM detected)\n",
@ -532,6 +540,7 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
{ {
unsigned long addr, size; unsigned long addr, size;
struct fb_info *p; struct fb_info *p;
int err;
if ((dp->resource[0].flags & IORESOURCE_MEM) == 0) if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
return -ENODEV; return -ENODEV;
@ -560,7 +569,13 @@ asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
pci_write_config_dword(dp, 4, 0x02800083); pci_write_config_dword(dp, 4, 0x02800083);
writeb(3, p->screen_base + 0x400784); writeb(3, p->screen_base + 0x400784);
init_asiliant(p, addr); err = init_asiliant(p, addr);
if (err) {
iounmap(p->screen_base);
release_mem_region(addr, size);
framebuffer_release(p);
return err;
}
pci_set_drvdata(dp, p); pci_set_drvdata(dp, p);
return 0; return 0;
@ -571,6 +586,7 @@ static void __devexit asiliantfb_remove(struct pci_dev *dp)
struct fb_info *p = pci_get_drvdata(dp); struct fb_info *p = pci_get_drvdata(dp);
unregister_framebuffer(p); unregister_framebuffer(p);
fb_dealloc_cmap(&p->cmap);
iounmap(p->screen_base); iounmap(p->screen_base);
release_mem_region(pci_resource_start(dp, 0), pci_resource_len(dp, 0)); release_mem_region(pci_resource_start(dp, 0), pci_resource_len(dp, 0));
pci_set_drvdata(dp, NULL); pci_set_drvdata(dp, NULL);