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

vt8623fb: arkfb: null pointer dereference fix

Browse Source 
This patch prevents null pointer dereference in arkfb and vt8623fb.

Signed-off-by: Ondrej Zajicek <santiago@crfreenet.org>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ondrej Zajicek 2007-06-01 00:46:43 -07:00 committed by Linus Torvalds
parent 2d9f95f916
commit 38d473f995
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/video/arkfb.c
View File

@ -1055,9 +1055,10 @@ err_enable_device:
static void __devexit ark_pci_remove(struct pci_dev *dev) static void __devexit ark_pci_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
struct arkfb_info *par = info->par;
if (info) { if (info) {
struct arkfb_info *par = info->par;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
if (par->mtrr_reg >= 0) { if (par->mtrr_reg >= 0) {
mtrr_del(par->mtrr_reg, 0, 0); mtrr_del(par->mtrr_reg, 0, 0);

3
drivers/video/vt8623fb.c
View File

@ -778,9 +778,10 @@ err_enable_device:
static void __devexit vt8623_pci_remove(struct pci_dev *dev) static void __devexit vt8623_pci_remove(struct pci_dev *dev)
{ {
struct fb_info *info = pci_get_drvdata(dev); struct fb_info *info = pci_get_drvdata(dev);
struct vt8623fb_info *par = info->par;
if (info) { if (info) {
struct vt8623fb_info *par = info->par;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
if (par->mtrr_reg >= 0) { if (par->mtrr_reg >= 0) {
mtrr_del(par->mtrr_reg, 0, 0); mtrr_del(par->mtrr_reg, 0, 0);