From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28A64C38A2A for ; Fri, 8 May 2020 13:13:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CAB3724956 for ; Fri, 8 May 2020 13:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588943622; bh=Z5iQ/y45laEYfpMIvVbfwwUyNxICJlk1K0BI1AQTMe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hfRuN+CE3ZTrPTA54dgYHgwe4aKgOHXD1al7jJGabsuERPH4icdDpYXSSzqjj2K0y 6ZRQ5hPeURTfOJR+49yM3XnAxOHEPZg4O12l1hebKGGkTSApdapQLRr8mJXdyNkkuT xW+o6lYBoGrtRFRq9GcCGfWPmnczGnqPklrHGay4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728582AbgEHNNi (ORCPT ); Fri, 8 May 2020 09:13:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:50714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729560AbgEHMro (ORCPT ); Fri, 8 May 2020 08:47:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8B83921473; Fri, 8 May 2020 12:47:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942064; bh=Z5iQ/y45laEYfpMIvVbfwwUyNxICJlk1K0BI1AQTMe4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oRTFQEaUOcS+3THF1jBPMynfw/iAKTCSEx8BvA5aS3FAzfF8ixUyoYrj3+sJimteE ASYkxDiWijmt1cagQ6PiHk/PtbrAqRlYjvTjMRlkKklOxHXdw2NV6zEbJSrvRejPea SfPcyeVqR6ZpX4HMHWo2eqi2H14F5/3lw7ds1cGk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Heinrich Schuchardt , Thadeu Lima de Souza Cascardo , "David S. Miller" Subject: [PATCH 4.4 283/312] net: ehea: avoid null pointer dereference Date: Fri, 8 May 2020 14:34:34 +0200 Message-Id: <20200508123144.309831655@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: xypron.glpk@gmx.de commit 1740c29a46b30a2f157afc473156f157e599d4c2 upstream. 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- 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_a 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);