Skip to contentSkip to conversation

cfag12864b: fix crash when built-in and no parport present

PATCH In review Miguel Ojeda 3 participants 6 messages Feb 10, 2007 – Feb 13, 2007

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cfag12864b: fix crash when built-in and no parport present

Andrew, Daniel who reported the crash has tested this patch and says that it works fine avoiding it, so you can merge.

drivers-add-lcd-support-fix-crash-when-built-in-and-no-parport-present.patch

---

drivers/auxdisplay/cfag12864b.c +19 -0
index 889583d..cb44cb4 100644
@@ -312,6 +312,17 @@ EXPORT_SYMBOL_GPL(cfag12864b_disable);
 EXPORT_SYMBOL_GPL(cfag12864b_isenabled);
 
 /*
+ * Is the module inited?
+ */
+
+static unsigned char cfag12864b_inited;
+unsigned char cfag12864b_isinited(void)
+{
+	return cfag12864b_inited;
+}
+EXPORT_SYMBOL_GPL(cfag12864b_isinited);
+
+/*
  * Module Init & Exit
  */
 
@@ -319,6 +330,13 @@ static int __init cfag12864b_init(void)
 {
 	int ret = -EINVAL;
 
+	/* ks0108_init() must be called first */
+	if (!ks0108_isinited()) {
+		printk(KERN_ERR CFAG12864B_NAME ": ERROR: "
+			"ks0108 is not initialized\n");
+		goto none;
+	}
+
 	if (PAGE_SIZE < CFAG12864B_SIZE) {
 		printk(KERN_ERR CFAG12864B_NAME ": ERROR: "
 			"page size (%i) < cfag12864b size (%i)\n",
@@ -354,6 +372,7 @@ static int __init cfag12864b_init(void)
 	cfag12864b_clear();
 	cfag12864b_on();
 
+	cfag12864b_inited = 1;
 	return 0;
 
 cachealloced:
drivers/auxdisplay/cfag12864bfb.c +9 -1
index 94765e7..66fafbb 100644
@@ -137,7 +137,14 @@ static struct platform_device *cfag12864
 
 static int __init cfag12864bfb_init(void)
 {
-	int ret;
+	int ret = -EINVAL;
+
+	/* cfag12864b_init() must be called first */
+	if (!cfag12864b_isinited()) {
+		printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: "
+			"cfag12864b is not initialized\n");
+		goto none;
+	}
 
 	if (cfag12864b_enable()) {
 		printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: "
@@ -162,6 +169,7 @@ static int __init cfag12864bfb_init(void
 		}
 	}
 
+none:
 	return ret;
 }
 
drivers/auxdisplay/ks0108.c +12 -0
index a637575..e6c3646 100644
@@ -111,6 +111,17 @@ EXPORT_SYMBOL_GPL(ks0108_address);
 EXPORT_SYMBOL_GPL(ks0108_page);
 
 /*
+ * Is the module inited?
+ */
+
+static unsigned char ks0108_inited;
+unsigned char ks0108_isinited(void)
+{
+	return ks0108_inited;
+}
+EXPORT_SYMBOL_GPL(ks0108_isinited);
+
+/*
  * Module Init & Exit
  */
 
@@ -142,6 +153,7 @@ static int __init ks0108_init(void)
 		goto registered;
 	}
 
+	ks0108_inited = 1;
 	return 0;
 
 registered:
include/linux/cfag12864b.h +5 -0
index 0bc45e6..1605dd8 100644
@@ -73,5 +73,10 @@ extern void cfag12864b_disable(void);
  */
 extern unsigned char cfag12864b_isenabled(void);
 
+/*
+ * Is the module inited?
+ */
+extern unsigned char cfag12864b_isinited(void);
+
 #endif /* _CFAG12864B_H_ */
 
include/linux/ks0108.h +3 -0
index 8047d4b..a2c54ac 100644
@@ -43,4 +43,7 @@ extern void ks0108_address(unsigned char
 /* Set the controller's current page (0..7) */
 extern void ks0108_page(unsigned char page);
 
+/* Is the module inited? */
+extern unsigned char ks0108_isinited(void);
+
 #endif /* _KS0108_H_ */
#1 lore raw
Quoted 2 lines · Miguel Ojeda

Andrew, Daniel who reported the crash has tested this patch and says that it works fine avoiding it, so you can merge.

Yes, I tested it with the ks0108 enabled alone, and with both ks0108 and CFAG12864B .. Both booted fully..

Daniel

#2 lore raw
In reply to Miguel Ojeda
Quoted 127 lines · On Sat, 10 Feb 2007 20:51:23 +0100 Miguel Ojeda <[email protected]> wrote:

Andrew, Daniel who reported the crash has tested this patch and says that it works fine avoiding it, so you can merge.

drivers-add-lcd-support-fix-crash-when-built-in-and-no-parport-present.patch

---

drivers/auxdisplay/cfag12864b.c +19 -0
index 889583d..cb44cb4 100644
@@ -312,6 +312,17 @@ EXPORT_SYMBOL_GPL(cfag12864b_disable);
 EXPORT_SYMBOL_GPL(cfag12864b_isenabled);
 
 /*
+ * Is the module inited?
+ */
+
+static unsigned char cfag12864b_inited;
+unsigned char cfag12864b_isinited(void)
+{
+	return cfag12864b_inited;
+}
+EXPORT_SYMBOL_GPL(cfag12864b_isinited);
+
+/*
  * Module Init & Exit
  */
 
@@ -319,6 +330,13 @@ static int __init cfag12864b_init(void)
 {
 	int ret = -EINVAL;
 
+	/* ks0108_init() must be called first */
+	if (!ks0108_isinited()) {
+		printk(KERN_ERR CFAG12864B_NAME ": ERROR: "
+			"ks0108 is not initialized\n");
+		goto none;
+	}
+
 	if (PAGE_SIZE < CFAG12864B_SIZE) {
 		printk(KERN_ERR CFAG12864B_NAME ": ERROR: "
 			"page size (%i) < cfag12864b size (%i)\n",
@@ -354,6 +372,7 @@ static int __init cfag12864b_init(void)
 	cfag12864b_clear();
 	cfag12864b_on();
 
+	cfag12864b_inited = 1;
 	return 0;
 
 cachealloced:
drivers/auxdisplay/cfag12864bfb.c +9 -1
index 94765e7..66fafbb 100644
@@ -137,7 +137,14 @@ static struct platform_device *cfag12864
 
 static int __init cfag12864bfb_init(void)
 {
-	int ret;
+	int ret = -EINVAL;
+
+	/* cfag12864b_init() must be called first */
+	if (!cfag12864b_isinited()) {
+		printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: "
+			"cfag12864b is not initialized\n");
+		goto none;
+	}
 
 	if (cfag12864b_enable()) {
 		printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: "
@@ -162,6 +169,7 @@ static int __init cfag12864bfb_init(void
 		}
 	}
 
+none:
 	return ret;
 }
 
drivers/auxdisplay/ks0108.c +12 -0
index a637575..e6c3646 100644
@@ -111,6 +111,17 @@ EXPORT_SYMBOL_GPL(ks0108_address);
 EXPORT_SYMBOL_GPL(ks0108_page);
 
 /*
+ * Is the module inited?
+ */
+
+static unsigned char ks0108_inited;
+unsigned char ks0108_isinited(void)
+{
+	return ks0108_inited;
+}
+EXPORT_SYMBOL_GPL(ks0108_isinited);
+
+/*
  * Module Init & Exit
  */
 
@@ -142,6 +153,7 @@ static int __init ks0108_init(void)
 		goto registered;
 	}
 
+	ks0108_inited = 1;
 	return 0;
 
 registered:
include/linux/cfag12864b.h +5 -0
index 0bc45e6..1605dd8 100644
@@ -73,5 +73,10 @@ extern void cfag12864b_disable(void);
  */
 extern unsigned char cfag12864b_isenabled(void);
 
+/*
+ * Is the module inited?
+ */
+extern unsigned char cfag12864b_isinited(void);
+
 #endif /* _CFAG12864B_H_ */
 
include/linux/ks0108.h +0 -0
index 8047d4b..a2c54ac 100644

include/linux/ks0108.h extern void ks0108_address(unsigned char · line 49

Quoted 7 lines
include/linux/ks0108.h +3 -0
@@ -43,4 +43,7 @@ extern void ks0108_address(unsigned char
 /* Set the controller's current page (0..7) */
 extern void ks0108_page(unsigned char page);
 
+/* Is the module inited? */
+extern unsigned char ks0108_isinited(void);
+
 #endif /* _KS0108_H_ */

This looks hacky.

Your patch didn't include a description of the bug (please always include such a description) so I'm not sure what's going on here. But I'm suspecting that module dependencies and appropriate choice of initcall levels is the right way to fix whatever bug this is.

#3 lore raw
Quoted 144 lines · Andrew Morton
Quoted 1 line · On Sat, 10 Feb 2007 20:51:23 +0100 Miguel Ojeda <[email protected]> wrote:

Andrew, Daniel who reported the crash has tested this patch and says that

it works fine avoiding it, so you can merge.

Quoted 2 lines

drivers-add-lcd-support-fix-crash-when-built-in-and-no-parport-present.patch

Review

Quoted 3 lines

---

(quoted diff) +0 -0

b/drivers/auxdisplay/cfag12864b.c

Review

Quoted 44 lines

index 889583d..cb44cb4 100644

drivers/auxdisplay/cfag12864b.c +19 -0
@@ -312,6 +312,17 @@ EXPORT_SYMBOL_GPL(cfag12864b_disable);
 EXPORT_SYMBOL_GPL(cfag12864b_isenabled);
 
 /*
+ * Is the module inited?
+ */
+
+static unsigned char cfag12864b_inited;
+unsigned char cfag12864b_isinited(void)
+{
+	return cfag12864b_inited;
+}
+EXPORT_SYMBOL_GPL(cfag12864b_isinited);
+
+/*
  * Module Init & Exit
  */
 
@@ -319,6 +330,13 @@ static int __init cfag12864b_init(void)
 {
 	int ret = -EINVAL;
 
+	/* ks0108_init() must be called first */
+	if (!ks0108_isinited()) {
+		printk(KERN_ERR CFAG12864B_NAME ": ERROR: "
+			"ks0108 is not initialized\n");
+		goto none;
+	}
+
 	if (PAGE_SIZE < CFAG12864B_SIZE) {
 		printk(KERN_ERR CFAG12864B_NAME ": ERROR: "
 			"page size (%i) < cfag12864b size (%i)\n",
@@ -354,6 +372,7 @@ static int __init cfag12864b_init(void)
 	cfag12864b_clear();
 	cfag12864b_on();
 
+	cfag12864b_inited = 1;
 	return 0;
 
 cachealloced:
(quoted diff) +0 -0

b/drivers/auxdisplay/cfag12864bfb.c

Quoted 77 lines

index 94765e7..66fafbb 100644

drivers/auxdisplay/cfag12864bfb.c +9 -1
@@ -137,7 +137,14 @@ static struct platform_device *cfag12864
 
 static int __init cfag12864bfb_init(void)
 {
-	int ret;
+	int ret = -EINVAL;
+
+	/* cfag12864b_init() must be called first */
+	if (!cfag12864b_isinited()) {
+		printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: "
+			"cfag12864b is not initialized\n");
+		goto none;
+	}
 
 	if (cfag12864b_enable()) {
 		printk(KERN_ERR CFAG12864BFB_NAME ": ERROR: "
@@ -162,6 +169,7 @@ static int __init cfag12864bfb_init(void
 		}
 	}
 
+none:
 	return ret;
 }
 
drivers/auxdisplay/ks0108.c +12 -0
index a637575..e6c3646 100644
@@ -111,6 +111,17 @@ EXPORT_SYMBOL_GPL(ks0108_address);
 EXPORT_SYMBOL_GPL(ks0108_page);
 
 /*
+ * Is the module inited?
+ */
+
+static unsigned char ks0108_inited;
+unsigned char ks0108_isinited(void)
+{
+	return ks0108_inited;
+}
+EXPORT_SYMBOL_GPL(ks0108_isinited);
+
+/*
  * Module Init & Exit
  */
 
@@ -142,6 +153,7 @@ static int __init ks0108_init(void)
 		goto registered;
 	}
 
+	ks0108_inited = 1;
 	return 0;
 
 registered:
include/linux/cfag12864b.h +5 -0
index 0bc45e6..1605dd8 100644
@@ -73,5 +73,10 @@ extern void cfag12864b_disable(void);
  */
 extern unsigned char cfag12864b_isenabled(void);
 
+/*
+ * Is the module inited?
+ */
+extern unsigned char cfag12864b_isinited(void);
+
 #endif /* _CFAG12864B_H_ */
 
include/linux/ks0108.h +0 -0
index 8047d4b..a2c54ac 100644

include/linux/ks0108.h extern void ks0108_address(unsigned char · line 49

Quoted 7 lines
include/linux/ks0108.h +3 -0
@@ -43,4 +43,7 @@ extern void ks0108_address(unsigned char
 /* Set the controller's current page (0..7) */
 extern void ks0108_page(unsigned char page);
 
+/* Is the module inited? */
+extern unsigned char ks0108_isinited(void);
+
 #endif /* _KS0108_H_ */

This looks hacky.

Quoted 3 lines

Your patch didn't include a description of the bug (please always include such a description) so I'm not sure what's going on here. But I'm

Indeed, sorry. The patch is about "crash on CONFIG_CFAG12864B=y in 2.6.20-rc3-mm1" ( http://lkml.org/lkml/2007/1/7/118 ).

Quoted 3 lines

suspecting that module dependencies and appropriate choice of initcall levels is the right way to fix whatever bug this is.

The problem comes when ks0108/cfag12864b are built-in and any parallel port is present. ks0108_init() is called first, as it should be, but fails to load (as there is no parallel port to use).

After that, cfag12864b_init() gets called, without knowing anything about ks0108 failed, and calls ks0108_writecontrol(), which dereferences an uninitialized pointer.

Init order is OK, I think. The problem is how to stop cfag12864b_init() being called if ks0108 failed to load. modprobe does it for us, but, how when built-in?

As anybody suggested another solution, I send that patch.

Regards,
Miguel

Signature · 2 lines
Miguel Ojeda
http://maxextreme.googlepages.com/index.htm
#4 lore raw
In reply to Andrew Morton
Quoted 3 lines · Andrew Morton

This looks hacky.

One other thing that could be added is a change in the initcalls . ks0108 should be subsys_initcall() and the LCD devices device_initcall(). That would make sure one runs before the other. I don't think that alone would fix the crash tho. I didn't suggest it before cause I think the order of the sources in the build system might do this implicitly even if both are in device_initcall ..

Daniel

#5 lore raw
Quoted 10 lines · Daniel Walker
Quoted 3 lines · Andrew Morton

This looks hacky.

One other thing that could be added is a change in the initcalls . ks0108 should be subsys_initcall() and the LCD devices device_initcall(). That would make sure one runs before the other. I

Yes, it could be better, although it is not necessary for now (link order is telling who should get called first).

Quoted 5 lines

don't think that alone would fix the crash tho. I didn't suggest it before cause I think the order of the sources in the build system might do this implicitly even if both are in device_initcall ..

Yes, link order matters; however, the problem is related to cfag12864b_init() being called if ks0108 failed. Indeed, if cfag12864b is called before ks0108 is a mistake too, but it isn't happening here.

I also think the solution looks hacky (I said that I was waiting for a better solution), and also I think it should be checked by the kernel at boot like modprobe does; but I don't know any other solution. Any ideas?

Signature · 2 lines
Miguel Ojeda
http://maxextreme.googlepages.com/index.htm