From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934217AbdK2RXP (ORCPT ); Wed, 29 Nov 2017 12:23:15 -0500 Received: from smtprelay0134.hostedemail.com ([216.40.44.134]:58159 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934196AbdK2RXL (ORCPT ); Wed, 29 Nov 2017 12:23:11 -0500 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::::,RULES_HIT:41:355:379:541:599:960:973:988:989:1042:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2828:2901:3138:3139:3140:3141:3142:3352:3622:3865:3867:3870:3873:3874:4321:5007:7576:7903:7904:9040:10004:10400:10848:10967:11232:11657:11658:11914:12043:12048:12266:12296:12438:12555:12740:12760:12895:13069:13311:13357:13439:14659:14721:21080:21433:21451:21627:30045:30054:30056:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:10,LUA_SUMMARY:none X-HE-Tag: thumb88_1b84386630656 X-Filterd-Recvd-Size: 2508 Message-ID: <1511976187.19952.65.camel@perches.com> Subject: Re: [PATCH] jsm_tty: Fix a possible null pointer dereference in two functions From: Joe Perches To: SF Markus Elfring , linux-serial@vger.kernel.org, Greg Kroah-Hartman , "Guilherme G. Piccoli" , Jiri Slaby Cc: LKML , kernel-janitors@vger.kernel.org Date: Wed, 29 Nov 2017 09:23:07 -0800 In-Reply-To: <5c78db97-88f5-8655-9a47-eeee0a043fba@users.sourceforge.net> References: <5c78db97-88f5-8655-9a47-eeee0a043fba@users.sourceforge.net> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.26.1-1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2017-11-29 at 17:40 +0100, SF Markus Elfring wrote: > From: Markus Elfring > Date: Wed, 29 Nov 2017 17:30:36 +0100 > > Move two debug messages so that a null pointer access can not happen > for the variable "ch" in these functions. An actual defect fix! Here you could probably cc stable too. > > This issue was detected by using the Coccinelle software. > > Fixes: 669fef464468d3f02d60a5cf725fc097e03c5cb8 ("serial: jsm: Convert jsm_printk to jsm_dbg") > > Signed-off-by: Markus Elfring > --- > drivers/tty/serial/jsm/jsm_tty.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/tty/serial/jsm/jsm_tty.c b/drivers/tty/serial/jsm/jsm_tty.c > index 469927d37b41..a34eed7344e5 100644 > --- a/drivers/tty/serial/jsm/jsm_tty.c > +++ b/drivers/tty/serial/jsm/jsm_tty.c > @@ -521,11 +521,10 @@ void jsm_input(struct jsm_channel *ch) > int s = 0; > int i = 0; > > - jsm_dbg(READ, &ch->ch_bd->pci_dev, "start\n"); > - > if (!ch) > return; > > + jsm_dbg(READ, &ch->ch_bd->pci_dev, "start\n"); > port = &ch->uart_port.state->port; > tp = port->tty; > > @@ -647,10 +646,10 @@ static void jsm_carrier(struct jsm_channel *ch) > int virt_carrier = 0; > int phys_carrier = 0; > > - jsm_dbg(CARR, &ch->ch_bd->pci_dev, "start\n"); > if (!ch) > return; > > + jsm_dbg(CARR, &ch->ch_bd->pci_dev, "start\n"); > bd = ch->ch_bd; > > if (!bd)