Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752167AbbKYLTt (ORCPT ); Wed, 25 Nov 2015 06:19:49 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:41599 "EHLO e28smtp07.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751579AbbKYLTr (ORCPT ); Wed, 25 Nov 2015 06:19:47 -0500 X-Helo: d28dlp02.in.ibm.com X-MailFrom: xinhui.pan@linux.vnet.ibm.com X-RcptTo: linux-kernel@vger.kernel.org Message-ID: <5655990D.7090300@linux.vnet.ibm.com> Date: Wed, 25 Nov 2015 19:18:37 +0800 From: xinhui User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: linux-kernel@vger.kernel.org CC: Greg Kroah-Hartman , Jiri Slaby , dvyukov@google.com, yanmin_zhang@linux.intel.com Subject: [PATCH] tty/n_gsm.c: fix false positive WARN_ON and do some codes improvement Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15112511-0025-0000-0000-00000845CF22 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1580 Lines: 50 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. */ -- 1.7.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/