From patchwork Sat Mar 23 03:24:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1061906 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=umn.edu Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=umn.edu header.i=@umn.edu header.b="COJxgHDF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44R5Vc3bt0z9sT1 for ; Sat, 23 Mar 2019 14:24:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727587AbfCWDYa (ORCPT ); Fri, 22 Mar 2019 23:24:30 -0400 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:59114 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726440AbfCWDY3 (ORCPT ); Fri, 22 Mar 2019 23:24:29 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 4C19DE11 for ; Sat, 23 Mar 2019 03:24:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26oeqFufZGqr for ; Fri, 22 Mar 2019 22:24:28 -0500 (CDT) Received: from mail-it1-f198.google.com (mail-it1-f198.google.com [209.85.166.198]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 0CA80E05 for ; Fri, 22 Mar 2019 22:24:28 -0500 (CDT) Received: by mail-it1-f198.google.com with SMTP id j127so3681743itj.7 for ; Fri, 22 Mar 2019 20:24:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v6X34qxWQckvLPk6rymloIf7kEi5ux17Mascwad/QGU=; b=COJxgHDF7+4sszqGNLAJeToigqDJ6iOVrC2EdFZPiIxut9VPd30ilhQB6K5dLyb0eg uNHK6wPxF5Rjif7SAhhVi4N3PxgTNKm6jmT5XgrEI+qkPeLo6WGPrbJQP5Cmo+iSRVBm zkPP604+oNit+tIeDnaofsjY9pk6bXO6Gvr9ojWqeViRIgtWYZJB1nbd+kH+ULxep/OH N+jSXIutRVvWbxEoIXB60sWf3zzw4NrtNPgbAhR3HyzPJPVykFFzJ3m+teYds3tCqnue yyAW3rYRwkabsopvU2V6hUvU9cPzK1y4IrCSCBJ2JtLOtEPjl4pu577oIR+xjdbk0Aka woJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v6X34qxWQckvLPk6rymloIf7kEi5ux17Mascwad/QGU=; b=rNxIr6uNctyNLIzGWEpTxBnlAk0kT/K7mbOxmWoe6DQA/5k/dKjk7xQdLp5scbiEVO WiNaYRe5xFeNByGdHWRilgA2tIU0a675jJnkGYcF9nzAJbydhmVad+bAx+uBsrekZ5nw RN1svaD77BjC6wSMAC9nC8/zH6GbefARu4hDwdxdzrvGxrDuj/rtBwyIcChVCUw8voaq BLP6Nd9ASIj4Axk7jcf/ZeE0aD8m/AWBJxHgIPbUkAbUwZvHGnw86x/gBRTQkdwkWRY4 Mv9bDiE5ksAZTM/zxMEcrcfra2JAtufjBlXUVQHe+qss8XxBjLZQBkQLfx3qNteX23/m cPGA== X-Gm-Message-State: APjAAAXYTWSU+gYoIWb1dl1jEgzxw4EuZdsWkA4ApSOCaV9lagmrrKeG biZQC17NgLQSKb6U/7ZP1SWrlqmlKA7UUDMqCaCTJD8oquCBzpvRtqahwebLKGu64qzl5bl3uH2 szz+KrC+i6/v1srkmqLOy X-Received: by 2002:a02:9042:: with SMTP id y2mr1379024jaf.113.1553311467606; Fri, 22 Mar 2019 20:24:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfyvGaEzDavLFFr9P3BsB4hbE3XD42J05DCFoM+GpCMHuClSCfMZoxpQZW6EH1hRNn7Hv3/g== X-Received: by 2002:a02:9042:: with SMTP id y2mr1379013jaf.113.1553311467391; Fri, 22 Mar 2019 20:24:27 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id f9sm4086670ioo.24.2019.03.22.20.24.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 20:24:25 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Ulf Hansson , Derek Chickles , Satanand Burla , Felix Manlunas , "David S. Miller" , Linus Walleij , Laurent Pinchart , =?utf-8?q?Jonathan_Neusc?= =?utf-8?b?aMOkZmVy?= , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2] net: liquidio: fix NULL pointer dereferences Date: Fri, 22 Mar 2019 22:24:19 -0500 Message-Id: <20190323032420.21162-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190311.121710.968693621648443243.davem@davemloft.net> References: <20190311.121710.968693621648443243.davem@davemloft.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case octeon_alloc_soft_command fails, the fix reports the error and goes to cleanup to avoid NULL pointer dereferences. Signed-off-by: Kangjie Lu --- V2: goto setup_nic_dev_free for cleanup --- drivers/mmc/host/mmc_spi.c | 2 +- drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 32fea585262b..a3533935e282 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -820,7 +820,7 @@ mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t, status = spi_sync_locked(spi, &host->m); if (status < 0) { - dev_dbg(&spi->dev, "read error %02x (%d)\n", status, status); + dev_dbg(&spi->dev, "read error %d\n", status); return status; } diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c index 54b245797d2e..e653072846b0 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c @@ -611,6 +611,12 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop) sc = (struct octeon_soft_command *) octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE, 16, 0); + if (!sc) { + netif_info(lio, rx_err, lio->netdev, + "Failed to allocate octeon_soft_command\n"); + return; + } + ncmd = (union octnet_cmd *)sc->virtdptr; @@ -1960,6 +1966,12 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) sc = (struct octeon_soft_command *) octeon_alloc_soft_command(octeon_dev, data_size, resp_size, 0); + if (!sc) { + dev_err(&octeon_dev->pci_dev->dev, + "Failed to allocate octeon_soft_command\n"); + goto setup_nic_dev_free; + } + resp = (struct liquidio_if_cfg_resp *)sc->virtrptr; vdata = (struct lio_version *)sc->virtdptr;