فهرست منبع

vt8623fb: arkfb: null pointer dereference fix

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>
Ondrej Zajicek 18 سال پیش
والد
کامیت
38d473f995
2فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 2 1
      drivers/video/arkfb.c
  2. 2 1
      drivers/video/vt8623fb.c

+ 2 - 1
drivers/video/arkfb.c

@@ -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);

+ 2 - 1
drivers/video/vt8623fb.c

@@ -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);