From patchwork Tue May 17 20:28:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 623262 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3r8TT03zcVz9vK1 for ; Wed, 18 May 2016 06:29:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751532AbcEQU3R (ORCPT ); Tue, 17 May 2016 16:29:17 -0400 Received: from mout.gmx.net ([212.227.17.22]:60627 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751054AbcEQU3O (ORCPT ); Tue, 17 May 2016 16:29:14 -0400 Received: from LT001.lan ([62.143.92.134]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0LbR3e-1bQVaG2VHW-00kzhK; Tue, 17 May 2016 22:29:02 +0200 From: Heinrich Schuchardt To: Thadeu Lima de Souza Cascardo Cc: "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Heinrich Schuchardt Subject: [PATCH 1/1] net: ehea: avoid null pointer dereference Date: Tue, 17 May 2016 22:28:54 +0200 Message-Id: <1463516934-10115-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.1.4 X-Provags-ID: V03:K0:6efdvjwawIT2XwL+iEIYBJxHUMaF5lakZXJuUUF2abxn2NhQ5I5 Oay5MCCsaxbLJQZpua+gDtRwCg/AoaE+MHPPKiGLBAi+0jSecumB/Ki9E1FDGh5SyUOPiw8 ZAN3StH17467I38GL+T7/V7Fkm4OdUTYPxu1sKud4uHGgWIkYknJ4zVUWjO1w8lrLfqwdWd PgNDaEdpS2ifO1l9Y/2Qg== X-UI-Out-Filterresults: notjunk:1; V01:K0:8lIhb/loEos=:q/aN1TJ+TUVat01WD9Vq9C Y3A+xHi+aSnGvWrRGFbnmXhMA1dgAErPOvHxLNmtTr4xLuG4X0fLzpwrY4ttQQsdJ8/ypNa+X eIG6nwH6p/LZwrDz+cS/7GdzkC3TYwVtmc0GNjrT/Dfs/+kNdnsUL8Idq87rVd8bAQKK+JseM 0cFzLIMA54/VRy02NZ6EUjtew2OIBBWtvFRowFCV5mjZUE2ThzFBF6HW59D3hEnp+h9HAFBUd tD7AnQsOMMZp5rehMcN0lKVHFst1kPmRvSAiMuOOPri1iW1gpOZOF5xIDIBHqqUaZ5lxVo5Cw G4rK0yzMJeh6t9+qA5aENZK/vUezDbndGkQoOv5qsRRNwCPF5CqZBjwlilW4GPnvpDu3DbjLm 0ZXekR5o+Dk4nXVhHhfjPBP2Rg0omezlomPVsX/EbTeOo6ErqCzrum8BIj39Fs3CGTAyFOSCe QEeRv3YMpmu4LVvMioUdAMTzAt5udqGrrQgrJAN9Br4bKEuzIXeLHm/sXA+u/ztpb9Y94GRTo c9YBQH522oRHoha4n+MjVdjuaTo2kjhO/7foGt0hsl1iLz6hqfsJSIXDZr9AZOeVenvTTO7cV QyyVvf4pwsRRec1Mbvf8QddN9zbTRlx6v6xL40+MlNfUtMM4XZ/L+dkFRmEsAB3gRnqwl3KCa pT6z0npA3OldKblSwGqPDw4gnWQRI4qFEv8gEUL2rJWlaDUlg36MwTqG3c7pcpftCT+hiier+ 5FQ+MXLXseRtgYf0YgbR9JMIBtvvltaAcS6sG5GVjmmfJ6wRzn29U4HfUnQ= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ehea_get_port may return NULL. Do not dereference NULL value. Fixes: 8c4877a4128e ("ehea: Use the standard logging functions") Signed-off-by: Heinrich Schuchardt Acked-by: Thadeu Lima de Souza Cascardo --- drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 2a0dc12..54efa9a 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -1169,16 +1169,15 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe) ec = EHEA_BMASK_GET(NEQE_EVENT_CODE, eqe); portnum = EHEA_BMASK_GET(NEQE_PORTNUM, eqe); port = ehea_get_port(adapter, portnum); + if (!port) { + netdev_err(NULL, "unknown portnum %x\n", portnum); + return; + } dev = port->netdev; switch (ec) { case EHEA_EC_PORTSTATE_CHG: /* port state change */ - if (!port) { - netdev_err(dev, "unknown portnum %x\n", portnum); - break; - } - if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) { if (!netif_carrier_ok(dev)) { ret = ehea_sense_port_attr(port);