Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752371AbbKYL2b (ORCPT ); Wed, 25 Nov 2015 06:28:31 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:51171 "EHLO e28smtp08.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751675AbbKYL23 (ORCPT ); Wed, 25 Nov 2015 06:28:29 -0500 X-IBM-Helo: d28dlp01.in.ibm.com X-IBM-MailFrom: xinhui@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Subject: Re: [PATCH] tty/n_gsm.c: fix false positive WARN_ON and do some codes improvement To: xinhui , linux-kernel@vger.kernel.org References: <5655990D.7090300@linux.vnet.ibm.com> Cc: Greg Kroah-Hartman , Jiri Slaby , dvyukov@google.com, yanmin_zhang@linux.intel.com From: xinhui Message-ID: <56559B13.40800@linux.vnet.ibm.com> Date: Wed, 25 Nov 2015 19:27:15 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <5655990D.7090300@linux.vnet.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15112511-0029-0000-0000-00000966DEF9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1880 Lines: 58 Hi, Jiri I made this patch based on your idea. Any modification is welcome. :) PS. "xinhui" or "xinhui.pan"@linux.vnet.ibm.com are same mail account, both of them are alias. thanks xinhui On 2015/11/25 19:18, xinhui wrote: > From: xinhui > > If gsm driver fails to activate one mux, and this mux is not stored in > gsm_mux[], there would be a warning in gsm_cleanup_mux(). Actually this > is a legal case. So just do a simple check instead of WARN_ON. > > There is one filed gsm->num to store its index of gsm_mux[]. So use > gsm->num to remove itself from gsm_mux[] instead of the for-loop > traverse. > > Reported-by: Dmitry Vyukov > Fixes: 5a64096700dc ("tty/n_gsm.c: fix a memory leak in gsmld_open") > Signed-off-by: Pan Xinhui > --- > drivers/tty/n_gsm.c | 12 +++++------- > 1 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c > index c3fe026..56377e1 100644 > --- a/drivers/tty/n_gsm.c > +++ b/drivers/tty/n_gsm.c > @@ -2037,15 +2037,13 @@ static void gsm_cleanup_mux(struct gsm_mux *gsm) > > gsm->dead = 1; > > + /* open failed before registering => nothing to do*/ > + if (gsm_mux[gsm->num] != gsm) > + return; > + > spin_lock(&gsm_mux_lock); > - for (i = 0; i < MAX_MUX; i++) { > - if (gsm_mux[i] == gsm) { > - gsm_mux[i] = NULL; > - break; > - } > - } > + gsm_mux[gsm->num] = NULL; > spin_unlock(&gsm_mux_lock); > - WARN_ON(i == MAX_MUX); > > /* In theory disconnecting DLCI 0 is sufficient but for some > modems this is apparently not the case. */ > -- 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/