public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Pan Xinhui <xinhuix.pan@intel.com>
To: gregkh@linuxfoundation.org, jslaby@suse.cz, linux-kernel@vger.kernel.org
Cc: yanmin_zhang@linux.intel.com, mnipxh@gmai.com
Subject: [PATCH v2] tty/n_gsm.c: fix a memory leak when gsmtty is removed
Date: Wed, 25 Mar 2015 15:05:33 +0800	[thread overview]
Message-ID: <55125E3D.2070109@intel.com> (raw)
In-Reply-To: <551111B9.3000008@intel.com>

when gsmtty_remove put dlci, it will cause memory leak if
dlci->port's refcount is zero.
So we do the cleanup work in .cleanup callback instead.

dlci will be last put in two call chains.
1) gsmld_close -> gsm_cleanup_mux -> gsm_dlci_release -> dlci_put
2) gsmld_remove -> dlci_put
so there is a race. the memory leak depends on the race.

In call chain 2. we hit the memory leak. bellow comment tells.

release_tty -> tty_driver_remove_tty -> gsmtty_remove -> dlci_put -> tty_port_destructor (WARN_ON(port->itty) and return directly)
						|
						--> tty->port->itty = NULL;
			|
		tty_kref_put ---> release_one_tty -> gsmtty_cleanup (now we do the cleanup work here.)
So our patch fix it by doing the cleanup work after tty core did.

Signed-off-by: xinhui.pan <xinhuix.pan@intel.com>
---
  drivers/tty/n_gsm.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index c434376..bce16e4 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -3170,7 +3170,7 @@ static int gsmtty_break_ctl(struct tty_struct *tty, int state)
  	return gsmtty_modem_update(dlci, encode);
  }
  
-static void gsmtty_remove(struct tty_driver *driver, struct tty_struct *tty)
+static void gsmtty_cleanup(struct tty_struct *tty)
  {
  	struct gsm_dlci *dlci = tty->driver_data;
  	struct gsm_mux *gsm = dlci->gsm;
@@ -3178,7 +3178,6 @@ static void gsmtty_remove(struct tty_driver *driver, struct tty_struct *tty)
  	dlci_put(dlci);
  	dlci_put(gsm->dlci[0]);
  	mux_put(gsm);
-	driver->ttys[tty->index] = NULL;
  }
  
  /* Virtual ttys for the demux */
@@ -3199,7 +3198,7 @@ static const struct tty_operations gsmtty_ops = {
  	.tiocmget		= gsmtty_tiocmget,
  	.tiocmset		= gsmtty_tiocmset,
  	.break_ctl		= gsmtty_break_ctl,
-	.remove			= gsmtty_remove,
+	.cleanup		= gsmtty_cleanup,
  };
  
  
-- 
1.9.1

  reply	other threads:[~2015-03-24  7:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-24  7:26 [PATCH] tty/n_gsm.c: fix a memory leak when gsmtty is removed Pan Xinhui
2015-03-25  7:05 ` Pan Xinhui [this message]
2015-03-26 21:36   ` [PATCH v2] " Greg KH
2015-03-28  2:42   ` [PATCH v2 RESEND] " Pan Xinhui
2015-03-27  8:51     ` Jiri Slaby

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=55125E3D.2070109@intel.com \
    --to=xinhuix.pan@intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mnipxh@gmai.com \
    --cc=yanmin_zhang@linux.intel.com \
    /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