diff options
author | Anton Blanchard <anton@samba.org> | 2010-04-06 07:42:38 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-04-07 20:16:20 -0400 |
commit | 320718ee074acce5ffced6506cb51af1388942aa (patch) | |
tree | 0c57b9337452263e8f032cd0f37069f70921c490 /drivers/char/hvc_console.c | |
parent | b7a413015d2986edf020fba765c906cc9cbcbfc9 (diff) |
hvc_console: Fix race between hvc_close and hvc_remove
I don't claim to understand the tty layer, but it seems like hvc_open and
hvc_close should be balanced in their kref reference counting.
Right now we get a kref every call to hvc_open:
if (hp->count++ > 0) {
tty_kref_get(tty); <----- here
spin_unlock_irqrestore(&hp->lock, flags);
hvc_kick();
return 0;
} /* else count == 0 */
tty->driver_data = hp;
hp->tty = tty_kref_get(tty); <------ or here if hp->count was 0
But hvc_close has:
tty_kref_get(tty);
if (--hp->count == 0) {
...
/* Put the ref obtained in hvc_open() */
tty_kref_put(tty);
...
}
tty_kref_put(tty);
Since the outside kref get/put balance we only do a single kref_put when
count reaches 0.
The patch below changes things to call tty_kref_put once for every
hvc_close call, and with that my machine boots fine.
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/char/hvc_console.c')
-rw-r--r-- | drivers/char/hvc_console.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index d3890e8d30e1..35cca4c7fb18 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
@@ -368,16 +368,12 @@ static void hvc_close(struct tty_struct *tty, struct file * filp) | |||
368 | hp = tty->driver_data; | 368 | hp = tty->driver_data; |
369 | 369 | ||
370 | spin_lock_irqsave(&hp->lock, flags); | 370 | spin_lock_irqsave(&hp->lock, flags); |
371 | tty_kref_get(tty); | ||
372 | 371 | ||
373 | if (--hp->count == 0) { | 372 | if (--hp->count == 0) { |
374 | /* We are done with the tty pointer now. */ | 373 | /* We are done with the tty pointer now. */ |
375 | hp->tty = NULL; | 374 | hp->tty = NULL; |
376 | spin_unlock_irqrestore(&hp->lock, flags); | 375 | spin_unlock_irqrestore(&hp->lock, flags); |
377 | 376 | ||
378 | /* Put the ref obtained in hvc_open() */ | ||
379 | tty_kref_put(tty); | ||
380 | |||
381 | if (hp->ops->notifier_del) | 377 | if (hp->ops->notifier_del) |
382 | hp->ops->notifier_del(hp, hp->data); | 378 | hp->ops->notifier_del(hp, hp->data); |
383 | 379 | ||