From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org
Subject: [PATCH 17/27] tty: moxa, fix refcounting in moxa_poll_port
Date: Mon, 06 Apr 2009 17:34:04 +0100 [thread overview]
Message-ID: <20090406163401.12934.35147.stgit@t61.ukuu.org.uk> (raw)
In-Reply-To: <20090406162959.12934.97904.stgit@t61.ukuu.org.uk>
From: Jiri Slaby <jirislaby@gmail.com>
There is missing tty_kref_put on some paths in moxa_poll_port,
although the reference is always taken. Fix it.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Reported-by: Jan 'Yenya' Kasprzak <kas@fi.muni.cz>
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
---
drivers/char/moxa.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 8b0da97..4a4cab7 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -1486,11 +1486,11 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
}
if (!handle) /* nothing else to do */
- return 0;
+ goto put;
intr = readw(ip); /* port irq status */
if (intr == 0)
- return 0;
+ goto put;
writew(0, ip); /* ACK port */
ofsAddr = p->tableAddr;
@@ -1499,16 +1499,17 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
ofsAddr + HostStat);
if (!inited)
- return 0;
+ goto put;
if (tty && (intr & IntrBreak) && !I_IGNBRK(tty)) { /* BREAK */
tty_insert_flip_char(tty, 0, TTY_BREAK);
tty_schedule_flip(tty);
}
- tty_kref_put(tty);
if (intr & IntrLine)
moxa_new_dcdstate(p, readb(ofsAddr + FlagStat) & DCD_state);
+put:
+ tty_kref_put(tty);
return 0;
}
next prev parent reply other threads:[~2009-04-06 15:39 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 16:31 [RESEND PATCH 00/27] Serial updates for 2.6.30 Alan Cox
2009-04-06 16:31 ` [PATCH 01/27] 8250_pnp.c: add another Wacom tablet Alan Cox
2009-04-06 16:32 ` [PATCH 02/27] serial: Update PNP IDs Alan Cox
2009-04-06 16:32 ` [PATCH 03/27] 8250_pci: add support for National Instruments 843x RS232 devices Alan Cox
2009-04-06 16:32 ` [PATCH 04/27] 8250_pci: add support for National Instruments legacy 8420 RS232 boards Alan Cox
2009-04-06 16:32 ` [PATCH 05/27] blackfin: BF538/9 serial uart support Alan Cox
2009-04-06 16:32 ` [PATCH 06/27] blackfin: Use unsigned long for flags with irq functions Alan Cox
2009-04-06 16:32 ` [PATCH 07/27] blackfin: Fix tty compile error in PIO mode Alan Cox
2009-04-06 16:32 ` [PATCH 08/27] Fix DMA rx ring buffer handling Alan Cox
2009-04-06 16:32 ` [PATCH 09/27] blackfin: Subtract ANOMALY_05000230 on quot Alan Cox
2009-04-06 16:32 ` [PATCH 10/27] applicom: Auto-load applicom module when device opened Alan Cox
2009-04-06 16:33 ` [PATCH 11/27] cyclades: Auto-load cyclades " Alan Cox
2009-04-06 16:33 ` [PATCH 12/27] specialix: Auto-load specialix " Alan Cox
2009-04-06 16:33 ` [PATCH 13/27] usb: Auto-load cdc_acm " Alan Cox
2009-04-06 16:33 ` [PATCH 14/27] riscom8: Auto-load riscom8 " Alan Cox
2009-04-06 16:33 ` [PATCH 15/27] ucc: Fix leaky error path Alan Cox
2009-04-06 16:33 ` [PATCH 16/27] isicom: isicom kref leak fix Alan Cox
2009-04-06 16:34 ` Alan Cox [this message]
2009-04-06 16:34 ` [PATCH 18/27] mxser: remove tty_port_tty_get from mxser_check_modem_status Alan Cox
2009-04-06 16:34 ` [PATCH 19/27] jsm: define init function as __devinit Alan Cox
2009-04-06 16:34 ` [PATCH 20/27] jsm: Fix the return variable and removing the unused retval Alan Cox
2009-04-06 16:34 ` [PATCH 21/27] mux: fix build problem Alan Cox
2009-04-06 16:34 ` [PATCH 22/27] icom: remove unused variables Alan Cox
2009-04-06 16:35 ` [PATCH 23/27] cdc-acm: zydas 1602 identifier needed Alan Cox
2009-04-06 16:35 ` [PATCH 24/27] tty: pl2303 needs identifiers for Siemens S81 as well as EF81 Alan Cox
2009-04-06 16:35 ` [PATCH 25/27] symbol: Remove various bits of left over junk Alan Cox
2009-04-06 16:35 ` [PATCH 26/27] rio: addition has higher precedence than ?: Alan Cox
2009-04-06 16:35 ` [PATCH 27/27] 8250: Fix warning Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090406163401.12934.35147.stgit@t61.ukuu.org.uk \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®