From patchwork Tue Mar 12 07:06:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1055094 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="pwW1Fq3s"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44JQyR61RWz9s7h for ; Tue, 12 Mar 2019 18:07:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727333AbfCLHHG (ORCPT ); Tue, 12 Mar 2019 03:07:06 -0400 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:43176 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726218AbfCLHHG (ORCPT ); Tue, 12 Mar 2019 03:07:06 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 815EB99B for ; Tue, 12 Mar 2019 07:07:04 +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 NhxN-ZwfnfKf for ; Tue, 12 Mar 2019 02:07:04 -0500 (CDT) Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) (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 4E65198B for ; Tue, 12 Mar 2019 02:07:04 -0500 (CDT) Received: by mail-io1-f69.google.com with SMTP id d7so1096673ios.17 for ; Tue, 12 Mar 2019 00:07:04 -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; bh=I0adBQm6SRwvdWTdamfcRPCdJqkyTewOxVjCdvmpccE=; b=pwW1Fq3s7DBbNn7yHjOSa9+XUl1jo58MtWIPJ1Nlo061Dtry+kB6HfnDVeZZCgj5rw 4LKZgcLihtw7PUQYFFKlv1SrT7n8vu91YSF1H1kcisxMKo85Iru7oghr0IpV/R6QfhGp 2HUITK/Lltz1Xpsoudm1SoCbH4xSvjb7fKsBnBeKL5AW8VycE5yLRjuGF2JIEe1XGoEC BdR6GzzyIRWdwVQ8923YiqZ31nUBSGgXD/oqZYBIDC+w4up4rB2JHtz9iIKm0HAeToYE oxdFmxEEkCSd4Z34V/GpLlmfZB+KjOlx/0nV7dEODwqM2fwRrra3Da8/aD+jheotrBo1 96RQ== 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; bh=I0adBQm6SRwvdWTdamfcRPCdJqkyTewOxVjCdvmpccE=; b=tMstF3GPL+diDxrQfN3WHtiZOhIZjb4n9V5BuuRbbB2mfwNmz/dVpcEj6bvu0Ae0Ou L7mm7hdyoUf2UmJfFmp2yhJ7DI5vqjrKyJ8OmxPMIYZcSu9Fe9kJADg0DY5umaALtBUR Y9Zc3IHUydxXjNowF7KkLSDz5aoGQd1eo8Out0w5Yf+GHuSFr3UnqCbYgVipWvlLF4W/ WO7DiNaqjvK9UajeH+sIamif6Y59VDGl3Ue9dfPePITesQpgvkA1tBajwtDNkXo6iejA BzrbfZWrc6r9BShs0FDP1x0HJ2vHVdiq0o9MQzcRQ+z1PfLIYPLjeqAff2clepQmgms1 Gi7Q== X-Gm-Message-State: APjAAAWpz3HcB3eUKv8moarX4odLgHJwHq01UTnT6mw0BYzMSe1Vl2ne gAt4kMi+wrPxAtzv6ZkX4ipcSRc6HPOkyzSncRzdztJ/jkSXrZSxmToZ1pzwfQeBA1vxobfPtbz uZhD1ol5qITVwiVIw/ETw X-Received: by 2002:a02:85ec:: with SMTP id d99mr12021315jai.116.1552374423973; Tue, 12 Mar 2019 00:07:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzPFjrwasrk0dvfIHCziGlK/LKctjbPevuagozk2jEfKtll673tEMJou5ZHDR/C/iHTVwE+oA== X-Received: by 2002:a02:85ec:: with SMTP id d99mr12021308jai.116.1552374423731; Tue, 12 Mar 2019 00:07:03 -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 e11sm3253138iog.79.2019.03.12.00.07.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 00:07:03 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, GR-Linux-NIC-Dev@marvell.com, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] net: qlogic: fix a potential NULL pointer dereference Date: Tue, 12 Mar 2019 02:06:47 -0500 Message-Id: <20190312070647.20844-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case create_singlethread_workqueue fails, the fix returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu --- drivers/net/ethernet/qlogic/qla3xxx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index 10b075bc5959..b61b88cbc0c7 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c @@ -3886,6 +3886,12 @@ static int ql3xxx_probe(struct pci_dev *pdev, netif_stop_queue(ndev); qdev->workqueue = create_singlethread_workqueue(ndev->name); + if (!qdev->workqueue) { + unregister_netdev(ndev); + err = -ENOMEM; + goto err_out_iounmap; + } + INIT_DELAYED_WORK(&qdev->reset_work, ql_reset_work); INIT_DELAYED_WORK(&qdev->tx_timeout_work, ql_tx_timeout_work); INIT_DELAYED_WORK(&qdev->link_state_work, ql_link_state_machine_work);