Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757110Ab0FNWVt (ORCPT ); Mon, 14 Jun 2010 18:21:49 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:55901 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757079Ab0FNWVm (ORCPT ); Mon, 14 Jun 2010 18:21:42 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=YLP1vFSUbQiXvDvpwUUJW+YbNiXipqzz+nYn6ajc9lJl044PD0R5bHyRFbWiE/254h A6Gfqz2Uvpy1t1HPxSYLw7x1rQJ1oryFWT+KGZ6hhYNQnWASFH2k4e8Y4YMRAvqEkZW1 z9d5Ho+kzoZOGFAxOY3ERl+bguTXGfLKqQJfE= From: John Kacur To: Thomas Gleixner Cc: lkml , rt-users , Clark Williams , Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar Subject: [PATCH 6/6] hvc_console: Fix race between hvc_close and hvc_remove Date: Tue, 15 Jun 2010 00:21:27 +0200 Message-Id: <1276554087-3632-7-git-send-email-jkacur@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1276554087-3632-1-git-send-email-jkacur@redhat.com> References: <1276554087-3632-1-git-send-email-jkacur@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2211 Lines: 75 From: Anton Blanchard 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 Acked-by: Amit Shah Signed-off-by: Rusty Russell Upstream-commit: 320718ee074acce5ffced6506cb51af1388942aa Signed-off-by: John Kacur --- 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 da70f68..2898084 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c @@ -367,16 +367,12 @@ static void hvc_close(struct tty_struct *tty, struct file * filp) hp = tty->driver_data; spin_lock_irqsave(&hp->lock, flags); - tty_kref_get(tty); if (--hp->count == 0) { /* We are done with the tty pointer now. */ hp->tty = NULL; spin_unlock_irqrestore(&hp->lock, flags); - /* Put the ref obtained in hvc_open() */ - tty_kref_put(tty); - if (hp->ops->notifier_del) hp->ops->notifier_del(hp, hp->data); -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/