[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <53D6067C.4000702@intel.com>
Date: Mon, 28 Jul 2014 16:14:52 +0800
From: "xinhui.pan" <xinhuix.pan@...el.com>
To: Greg KH <gregkh@...uxfoundation.org>, Jiri Slaby <jslaby@...e.cz>
CC: "Zhang, Yanmin" <yanmin_zhang@...ux.intel.com>,
Peter Hurley <peter@...leysoftware.com>,
mnipxh <mnipxh@...il.com>, linux-kernel@...r.kernel.org
Subject: [PATCH] tty/n_gsm.c: fix a memory leak in gsmld_open
If gsmld_attach_gsm fails, the gsm is not used anymore.
tty core will not call gsmld_close to do the cleanup work.
tty core just restore to the tty old ldisc.
That always causes memory leak.
Signed-off-by: xinhui.pan <xinhuiX.pan@...el.com>
Reported-by: Peter Hurley <peter@...leysoftware.com>
---
drivers/tty/n_gsm.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 81e7ccb..6cb1a6d 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2368,6 +2368,7 @@ static void gsmld_close(struct tty_struct *tty)
static int gsmld_open(struct tty_struct *tty)
{
struct gsm_mux *gsm;
+ int ret;
if (tty->ops->write == NULL)
return -EINVAL;
@@ -2382,7 +2383,13 @@ static int gsmld_open(struct tty_struct *tty)
/* Attach the initial passive connection */
gsm->encoding = 1;
- return gsmld_attach_gsm(tty, gsm);
+
+ ret = gsmld_attach_gsm(tty, gsm);
+ if (ret != 0) {
+ gsm_cleanup_mux(gsm);
+ mux_put(gsm);
+ }
+ return ret;
}
/**
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists