diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2008-07-24 00:29:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 13:47:30 -0400 |
commit | e0426e6a09954d205da2d674a3d368d2715e3afd (patch) | |
tree | fcdc9863df9b7458f51730aaf8ab022dd87fcc84 /drivers | |
parent | bbe48ecc7f6559318cfc6c023da225a0b0e14ab3 (diff) |
vt: hold console_sem across sysfs operations
Hold console sem while creating/destroying sysfs files. Serialisation is
so far done by BKL held in tty release_dev and chrdev_open, but no other
locks are held in open path.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Aristeu Rozanski <aris@ruivo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/vt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index e32a076d5f1f..ab53a1d4d895 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c | |||
@@ -2749,8 +2749,8 @@ static int con_open(struct tty_struct *tty, struct file *filp) | |||
2749 | tty->termios->c_iflag |= IUTF8; | 2749 | tty->termios->c_iflag |= IUTF8; |
2750 | else | 2750 | else |
2751 | tty->termios->c_iflag &= ~IUTF8; | 2751 | tty->termios->c_iflag &= ~IUTF8; |
2752 | release_console_sem(); | ||
2753 | vcs_make_sysfs(tty); | 2752 | vcs_make_sysfs(tty); |
2753 | release_console_sem(); | ||
2754 | return ret; | 2754 | return ret; |
2755 | } | 2755 | } |
2756 | } | 2756 | } |
@@ -2775,8 +2775,8 @@ static void con_close(struct tty_struct *tty, struct file *filp) | |||
2775 | if (vc) | 2775 | if (vc) |
2776 | vc->vc_tty = NULL; | 2776 | vc->vc_tty = NULL; |
2777 | tty->driver_data = NULL; | 2777 | tty->driver_data = NULL; |
2778 | release_console_sem(); | ||
2779 | vcs_remove_sysfs(tty); | 2778 | vcs_remove_sysfs(tty); |
2779 | release_console_sem(); | ||
2780 | mutex_unlock(&tty_mutex); | 2780 | mutex_unlock(&tty_mutex); |
2781 | /* | 2781 | /* |
2782 | * tty_mutex is released, but we still hold BKL, so there is | 2782 | * tty_mutex is released, but we still hold BKL, so there is |