From patchwork Mon Mar 11 06:51:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1054171 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="bvRK435D"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44HpfY4KlMz9s3q for ; Mon, 11 Mar 2019 17:51:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726796AbfCKGvP (ORCPT ); Mon, 11 Mar 2019 02:51:15 -0400 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:50054 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725869AbfCKGvJ (ORCPT ); Mon, 11 Mar 2019 02:51:09 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id AD5629FF for ; Mon, 11 Mar 2019 06:51:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mxrpJ5_TQkCN for ; Mon, 11 Mar 2019 01:51:07 -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-p8.oit.umn.edu (Postfix) with ESMTPS id 872AB5C3 for ; Mon, 11 Mar 2019 01:51:07 -0500 (CDT) Received: by mail-io1-f69.google.com with SMTP id c2so3452688ioh.11 for ; Sun, 10 Mar 2019 23:51:07 -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=bvRK435D6d1aqOQwRYQQORz8ujadKwnA+YPJSwO2d4zDICpFI7ww5KbWNTOxmsGy1f aJE5dT1+iJygTfzf/LYCBhk6eGvJWmgCuK8I5i6Iwr3q+/j65P7mYI5ez04PYFDf5iTs 8xPCp2bFYy/u3S7PmfPq4oH2Ajql5u3T2MB/7imv+wF2S8GaRYHQYUBgM+6lvegu7VQs P1w1/en79oYbm1uFbds0bikqmeNrTA3AUgqYzRgoacz+gUJna3eTA+oNcklFzN0N+6XJ OC6ZXYcfpbiKbQJ/c5c25IAlFRiGPKKypbjjWZxLmvEHRKSHoWAtGbZRQ62STEeZ5xno ajlA== 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=o5KsWhFeRa6RR59Ymp90cChV4AamhgKxwXfJksxqAVx1IC8KFAEgN+vVv6C1mZenbg YxPilJ4BAN2bJjHHtG03Z2yEBDP4CRNgdLxlinVNODEX01r8DzNG1qlkNUD55CXNOMm5 zgcHf4rICmyuFhYS6Kl6gnxeWGf27mqt7I8EvrwjgdWQxkdO/Jp4E7PA7/FBnsBufuKP amsUWJi3G1Fa0ODUqnxrVIAocwtJqakvLoCKteTCg9qeM0PJvDuyNa8mxPxslMvYHQbq fYEtqOeZeSRlaOLt09NgbWLYTSP8jhOkaeTal4eKCyK15Dw7Dn7gb0PTL1GsBaVxxDiU rukQ== X-Gm-Message-State: APjAAAUMQLCt0fLQxKQBiDwkvh7V4AAIMnAFgJWsMLhslje0Wq1W4XyU JepHU2L/V7emQsEGacloYwxj66L4htXyAYhHtU3U11vvxRisCGTavvnSvluFzHlIm3vTLw+hA3T /8KtR04Ulhei54lw+QpP9 X-Received: by 2002:a24:2c11:: with SMTP id i17mr14509423iti.146.1552287066712; Sun, 10 Mar 2019 23:51:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqxuj9yhYJ98d/3wGs4uFooZ2dEORG6f+DmAjCK+aduf6vpTnq3wt/Xu0dvOsX2MC7Z+YHtXig== X-Received: by 2002:a24:2c11:: with SMTP id i17mr14509414iti.146.1552287066434; Sun, 10 Mar 2019 23:51:06 -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 q8sm2123661ioj.72.2019.03.10.23.51.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 23:51:05 -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] next: qlogic: fix a potential NULL pointer dereference Date: Mon, 11 Mar 2019 01:51:00 -0500 Message-Id: <20190311065100.22203-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);