diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-27 10:30:59 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-27 10:30:59 -0500 |
| commit | dadc63b85414eb711425e70b4140a640fa74ef09 (patch) | |
| tree | c7cb4097a782e50f6f742c16252d949bae3abdcb /tty-ldisc-fix-open-flag-handling.patch | |
| parent | ea17f5cd11149cf323198d4b896819a925357bca (diff) | |
| download | kernel-dadc63b85414eb711425e70b4140a640fa74ef09.tar.gz kernel-dadc63b85414eb711425e70b4140a640fa74ef09.tar.xz kernel-dadc63b85414eb711425e70b4140a640fa74ef09.zip | |
more patches for this tty open race
Diffstat (limited to 'tty-ldisc-fix-open-flag-handling.patch')
| -rw-r--r-- | tty-ldisc-fix-open-flag-handling.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/tty-ldisc-fix-open-flag-handling.patch b/tty-ldisc-fix-open-flag-handling.patch new file mode 100644 index 000000000..4213aebb5 --- /dev/null +++ b/tty-ldisc-fix-open-flag-handling.patch @@ -0,0 +1,54 @@ +From linux-kernel-owner@vger.kernel.org Wed Nov 24 18:28:11 2010 +From: Jiri Slaby <jslaby@suse.cz> +Subject: [PATCH 1/2] TTY: ldisc, fix open flag handling +Date: Thu, 25 Nov 2010 00:27:54 +0100 + +When a concrete ldisc open fails in tty_ldisc_open, we forget to clear +TTY_LDISC_OPEN. This causes a false warning on the next ldisc open: +WARNING: at drivers/char/tty_ldisc.c:445 tty_ldisc_open+0x26/0x38() +Hardware name: System Product Name +Modules linked in: ... +Pid: 5251, comm: a.out Tainted: G W 2.6.32-5-686 #1 +Call Trace: + [<c1030321>] ? warn_slowpath_common+0x5e/0x8a + [<c1030357>] ? warn_slowpath_null+0xa/0xc + [<c119311c>] ? tty_ldisc_open+0x26/0x38 + [<c11936c5>] ? tty_set_ldisc+0x218/0x304 +... + +So clear the bit when failing... + +Introduced in c65c9bc3efa (tty: rewrite the ldisc locking) back in +2.6.31-rc1. + +Signed-off-by: Jiri Slaby <jslaby@suse.cz> +Cc: Alan Cox <alan@linux.intel.com> +Reported-by: Sergey Lapin <slapin@ossfans.org> +Tested-by: Sergey Lapin <slapin@ossfans.org> +--- + drivers/tty/tty_ldisc.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c +index d8e96b0..4214d58 100644 +--- a/drivers/tty/tty_ldisc.c ++++ b/drivers/tty/tty_ldisc.c +@@ -454,6 +454,8 @@ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld) + /* BTM here locks versus a hangup event */ + WARN_ON(!tty_locked()); + ret = ld->ops->open(tty); ++ if (ret) ++ clear_bit(TTY_LDISC_OPEN, &tty->flags); + return ret; + } + return 0; +-- +1.7.3.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/ + |