Fix init ordering of /dev/console vs callers of modprobe

dhowells · torvalds · commit 31d1d48e199e · 2010-08-06T09:17:02.000-07:00
Make /dev/console get initialised before any initialisation routine that
invokes modprobe because if modprobe fails, it's going to want to open
/dev/console, presumably to write an error message to.

The problem with that is that if the /dev/console driver is not yet
initialised, the chardev handler will call request_module() to invoke
modprobe, which will fail, because we never compile /dev/console as a
module.

This will lead to a modprobe loop, showing the following in the kernel
log:

	request_module: runaway loop modprobe char-major-5-1
	request_module: runaway loop modprobe char-major-5-1
	request_module: runaway loop modprobe char-major-5-1
	request_module: runaway loop modprobe char-major-5-1
	request_module: runaway loop modprobe char-major-5-1

This can happen, for example, when the built in md5 module can't find
the built in cryptomgr module (because the latter fails to initialise).
The md5 module comes before the call to tty_init(), presumably because
'crypto' comes before 'drivers' alphabetically.

Fix this by calling tty_init() from chrdev_init().

Signed-off-by: David Howells &lt;dhowells@redhat.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
@@ -916,7 +916,7 @@ static int __init chr_dev_init(void)
 			      NULL, devlist[minor].name);
 	}
 
-	return 0;
+	return tty_init();
 }
 
 fs_initcall(chr_dev_init);
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
@@ -3128,7 +3128,7 @@ static struct cdev tty_cdev, console_cdev;
  * Ok, now we can initialize the rest of the tty devices and can count
  * on memory allocations, interrupts etc..
  */
-static int __init tty_init(void)
+int __init tty_init(void)
 {
 	cdev_init(&tty_cdev, &tty_fops);
 	if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
@@ -3149,4 +3149,4 @@ static int __init tty_init(void)
 #endif
 	return 0;
 }
-module_init(tty_init);
+
diff --git a/fs/char_dev.c b/fs/char_dev.c
@@ -20,6 +20,7 @@
 #include <linux/cdev.h>
 #include <linux/mutex.h>
 #include <linux/backing-dev.h>
+#include <linux/tty.h>
 
 #include "internal.h"
 
diff --git a/include/linux/tty.h b/include/linux/tty.h
@@ -552,6 +552,9 @@ static inline void tty_audit_push_task(struct task_struct *tsk,
 }
 #endif
 
+/* tty_io.c */
+extern int __init tty_init(void);
+
 /* tty_ioctl.c */
 extern int n_tty_ioctl_helper(struct tty_struct *tty, struct file *file,
 		       unsigned int cmd, unsigned long arg);

Original file line number	Diff line number	Diff line change
`@@ -916,7 +916,7 @@ static int __init chr_dev_init(void)`
`916`	`916`	`NULL, devlist[minor].name);`
`917`	`917`	`}`
`918`	`918`
`919`		`- return 0;`
	`919`	`+ return tty_init();`
`920`	`920`	`}`
`921`	`921`
`922`	`922`	`fs_initcall(chr_dev_init);`
Original file line number	Diff line number	Diff line change
`@@ -3128,7 +3128,7 @@ static struct cdev tty_cdev, console_cdev;`
`3128`	`3128`	`* Ok, now we can initialize the rest of the tty devices and can count`
`3129`	`3129`	`* on memory allocations, interrupts etc..`
`3130`	`3130`	`*/`
`3131`		`-static int __init tty_init(void)`
	`3131`	`+int __init tty_init(void)`
`3132`	`3132`	`{`
`3133`	`3133`	`cdev_init(&tty_cdev, &tty_fops);`
`3134`	`3134`	`if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) \|\|`
`@@ -3149,4 +3149,4 @@ static int __init tty_init(void)`
`3149`	`3149`	`#endif`
`3150`	`3150`	`return 0;`
`3151`	`3151`	`}`
`3152`		`-module_init(tty_init);`
	`3152`	`+`
Original file line number	Diff line number	Diff line change
`@@ -552,6 +552,9 @@ static inline void tty_audit_push_task(struct task_struct *tsk,`
`552`	`552`	`}`
`553`	`553`	`#endif`
`554`	`554`
	`555`	`+/* tty_io.c */`
	`556`	`+extern int __init tty_init(void);`
	`557`	`+`
`555`	`558`	`/* tty_ioctl.c */`
`556`	`559`	`extern int n_tty_ioctl_helper(struct tty_struct tty, struct file file,`
`557`	`560`	`unsigned int cmd, unsigned long arg);`