From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933704AbdK2QlE (ORCPT ); Wed, 29 Nov 2017 11:41:04 -0500 Received: from mout.web.de ([217.72.192.78]:51918 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754062AbdK2QlC (ORCPT ); Wed, 29 Nov 2017 11:41:02 -0500 To: linux-serial@vger.kernel.org, Greg Kroah-Hartman , "Guilherme G. Piccoli" , Jiri Slaby , Joe Perches Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] jsm_tty: Fix a possible null pointer dereference in two functions Message-ID: <5c78db97-88f5-8655-9a47-eeee0a043fba@users.sourceforge.net> Date: Wed, 29 Nov 2017 17:40:15 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Yki1p8ItrCua3ExtsaDSV43CzEvC+9J6IJFSHcWyGA4uvBjbKxm FxuOxN02ocf9xSi/+HHlmNCkD7xNT0XH7gy4hrE513/+tXZ8dQpJdXWqvdcpC/5B1AHJyR7 KwcoV3gxZqp12bRwtPaaDCnu6fMHpE45XASvb1Z6BIgjgI5Yl/AM1daYZpA2HoXn0TsFfUs UQ7NVoebwYLkQW+ZXmVUQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:4Lm8YHlqVlQ=:djRnKKlnV3X4JD53ncqcCx 6Ov4LzNPIu45fgI5tRDLMfh7ypON7rYhqUb4BZmuiaTsIYTxa3F4vpifAXND/wYvb0eCh0Rcz dFMW15As5VLfdmvBeJezKIZp+rNktufNJPwYztlMaxxHINMicXW5LoM2Hh+9lsLhYwoF2PRie HjpTeZ+fOLlAP9Z/5pNoyHxcTB2kRIe+SgQqRgB1uEY5xWTnMdWueyUTYPSvFX7vsRbTO9EpP +btbL2i48qNqrkPigG3w+tXCQDPvCUSLG/IRK7+JuPE0z9lUGfZOgaGgtbY+f9ihryY5ZDO3o uQEXwZ7VxTYYyiJG8q5/Bu3y0d9+TMZ57B20B9MgmOUnz3oxfR4wJOqcziwyLXgSCxsXOKQVy Q2qp3ogiCOkScfWdWnvEpeIaPE28wCN1zhHEeBlEK01n24S1V6gvjs1sIsXK9bkE2hl19mP0s VXt5s0ZyXWRLOGE7VYwWw3icDy/lntKAffn4Wsz+W2swWCwfeIehomJgXx+Zcubbd8iwtC58U V7kIY15I/cg5OHeUIuxDnwIYxnPPAY9ygwVU9Xq4L3a+mYgvjwSR3sVai5Z4Bm7xcOLv/wjVi Xu6fRYMvn7EAGyXDWfpOqQImUam4JWH/t0Rk8NOAnCaWe0mcaoShHAqii7T7mocdD3qdto/6w 108Il/qieOuHCN0xW9UrsNBPiqanrtQTQiIJR3aK0YrXuv05PT8ZoziEQ2h/NonccevStvTUe jMR2SjWQlNI9G00K20hlnom6CPgzVS1UQqqb4X/C06hcdfp3IMygDd/RZQg4v8QJRH+rH91mY uSzOAJDMucOkV1ibZRxCVhzh3gCmdnCY2bY0XHu7hrhs75JSvo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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) -- 2.15.0