From patchwork Sat Apr 15 13:05:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 751030 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w4vsx3RGbz9s7j for ; Sat, 15 Apr 2017 23:06:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CB6F2C21C5E; Sat, 15 Apr 2017 13:06:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 11DCFC21C3F; Sat, 15 Apr 2017 13:06:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3F0EDC21C3F; Sat, 15 Apr 2017 13:06:01 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lists.denx.de (Postfix) with ESMTPS id DD14CC21C3C for ; Sat, 15 Apr 2017 13:06:00 +0000 (UTC) Received: from LT002.fritz.box ([95.222.184.236]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Mhdex-1cd9a70QSZ-00MuRh; Sat, 15 Apr 2017 15:06:00 +0200 From: Heinrich Schuchardt To: Marek Vasut , u-boot@lists.denx.de Date: Sat, 15 Apr 2017 15:05:46 +0200 Message-Id: <20170415130546.25341-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.11.0 X-Provags-ID: V03:K0:BhZBzyvbMXFgkrIqT1hHHKiNx2XX/MIPRhG/eR3JGNQ+6Q7pw+7 fCWbrWs07GAIuX0KpA+EENLR+rEE2knUu5EUImc2EHJwUZzsyr895KmZ0x8YqsltrnbquLp atKY1kOIrPjlynZZLaDE5TWgZom0o5tBq7y5h4mZCTok0tZ82tSNBjL3GF0DAr9hlRPnOUm TVVMbUC2fkEvp74unDHeQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ybjlP/JkvXw=:Vqxs6G7UcX2Ef2aYK8Ll2/ A0Rz81sbuFiN1bTrXu5N+eHWKuTR+TuHJOhRdmeEYDFKfDwW14RzE+Vy+VmOKcFwnOH0LgBtS HH82+aFPBJWAm0XtTBryuvizQ8+/yI+P/J6Noz5Tkb/qqxCcZOwudUcUNheu/BdeuAfbDwL34 dJa+gw33Qs4xJyJE4XDGlTQsGUV+Wm95QfiNxFEjZ613xSe23P/qBUooV9phyFsEFlC3YTEZG mcDU+UL9+O4sNuyX/UpmYIP62R22+9/G+dqfsC8BJrua4+y0uxp/wh5tQEDHbJEG6en0JvJP6 aNkCplPnGHco/We27MluT8i13+DUXXSlxKxssZsxsyBJnR51TFP6tkpcG/BeE6TogN/a7Rn+j 9OQqbF21mZwM7Oza1kx12qoJtafWvEldk6phFsRtiwgReDS/AgCrO2rwWUJxPR2vbBU00HA5v YK8cnIz9vYzht9lVLclx9AqUadjqEN12yget5sa2PcnWUb9I13XwdEzOj3djvQhjAuLhUxigg Zy5DqDRJKk8uNUDImpiOfVYkuPdGrF2DVGg0ol9xZkaE1oHS+/4PYfCqHCJrsVC9E5hfVbJl6 IVqk5OzXEhtZ8i8MEFpMOfM6AywULuzZkwG4nde+n5YVY9K56WQ6FK29qQFoSqm76vRKs6XXC dytaJbmWSCfULIIK/FbYINsMkGxItZkxLsVTpYBlACUETylNCh6/LoEEYmc09/SqkjnsvIm/A aynzct+F7dl9gd7HvFs5kVaoUQfHHMJhqD43b0O+/9r0K8fyu4S6YkZpx9U= Cc: Heinrich Schuchardt Subject: [U-Boot] [PATCH 1/1] usbtty: avoid potential NULL pointer dereference X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If current_urb is NULL it should not be dereferenced. The problem was indicated by cppcheck. Signed-off-by: Heinrich Schuchardt Reviewed-by: Tom Rini --- drivers/serial/usbtty.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index 2e19813643..29799dce93 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -850,6 +850,13 @@ static int write_buffer (circbuf_t * buf) struct urb *current_urb = NULL; current_urb = next_urb (device_instance, endpoint); + + if (!current_urb) { + TTYERR ("current_urb is NULL, buf->size %d\n", + buf->size); + return 0; + } + /* TX data still exists - send it now */ if(endpoint->sent < current_urb->actual_length){ @@ -871,12 +878,6 @@ static int write_buffer (circbuf_t * buf) */ while (buf->size > 0) { - if (!current_urb) { - TTYERR ("current_urb is NULL, buf->size %d\n", - buf->size); - return total; - } - dest = (char*)current_urb->buffer + current_urb->actual_length;