From patchwork Mon Mar 11 06:53:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1054172 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="Q3+WaJIz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Hpj05dj8z9s3q for ; Mon, 11 Mar 2019 17:53:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726562AbfCKGxX (ORCPT ); Mon, 11 Mar 2019 02:53:23 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:54638 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725870AbfCKGxX (ORCPT ); Mon, 11 Mar 2019 02:53:23 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id E6F1DB5D for ; Mon, 11 Mar 2019 06:53:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VybrvFBi4KZj for ; Mon, 11 Mar 2019 01:53:21 -0500 (CDT) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id B9ACFB52 for ; Mon, 11 Mar 2019 01:53:21 -0500 (CDT) Received: by mail-io1-f70.google.com with SMTP id v3so3534988iol.3 for ; Sun, 10 Mar 2019 23:53:21 -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=BwclKcHlyNokEmZBkCixxXn65ldk71jtuuiFi/oNrYc=; b=Q3+WaJIzerhOigmCWcgB/aTx364zg2qKFDEjtT/cE3LR1owhn96WRUCc4HDZ3hi4W3 N78Kt7QGA/iHfKsEu0/CumO0EPGhEzRSV3PGy/6lx9lWAOq3Cwi0UuIMgoAlBgh7cu4j 5iFxyr98g1nNuyy/WPrmjE98Mlaaw+kByQ5F8T9E8GxWf1JSRiqmeU9J9CN34ZrlihTS fhew+u3/or2glIvU6PuMz+5yrEYsxdGqclJAGg+NXGdTl79pvOgr0URXIwkXu/rLyQlM I5CnIiyKeA+YU3BsfAG9se8A/PsuXDDNGZc3/ZahfxqtYssUUbMAYU4DG64dn8a2pzGf W86Q== 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=BwclKcHlyNokEmZBkCixxXn65ldk71jtuuiFi/oNrYc=; b=qjM+9Ekcl60XOWeVBmxh8y45kG7B7x08EckIjxsSlwy8RpQR0TZyg7lLQlVtONQxr2 bSBrzo2/8LLcrBqZ1mt8aUR1aobq5ViiHlwJ4L7+eU9yiieu2cER2U6O+Y6yT5egRLCQ 3frkFwmcLl9QrpvtRIk4E9A78T6aST7Gae1QKBxJ28xQLxFqZeMPbuAEeEMDwAmaQVMB ttdN3iNF0D07IC3kArbTtF3UTiiXkRj1mizXAahsilpcgBg8ZFaaPrBVhpBCh2IP2RpR XGp69wFJWaRrkLUnFX5LTo5cn+P/f5apOyFLonByDqECPn4WEfQQWmhsrLDJ3ghm0+Tp ZKZw== X-Gm-Message-State: APjAAAXAxeIIBy8wd7N9v1iQsqmxf6zZSU0TYoXBSn1YR4MpJJ1yv9Wk S8Il37WSR205FnE4OQ+Rr9Y5/C/N1/1D5uRqK4JrSVpFdTFkztq9dg4IhkXj6dROCgZvmZWMRYw CE86vHM4SPhjgrkGBI0tM X-Received: by 2002:a24:ac58:: with SMTP id m24mr14148948iti.129.1552287201366; Sun, 10 Mar 2019 23:53:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqySMLxmimw8rqqTlemL7xujLWZeSRaLcbQoudPjUhxGq30LpTpDiI7B7+YWUsISdmEXIxlnuA== X-Received: by 2002:a24:ac58:: with SMTP id m24mr14148941iti.129.1552287201166; Sun, 10 Mar 2019 23:53:21 -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 p18sm7713571itp.10.2019.03.10.23.53.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Mar 2019 23:53:20 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Manish Chopra , GR-Linux-NIC-Dev@marvell.com, "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: qlge: fix a potential NULL pointer dereference Date: Mon, 11 Mar 2019 01:53:15 -0500 Message-Id: <20190311065315.23070-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 alloc_ordered_workqueue fails, the fix returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu --- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index 096515c27263..07e1c623048e 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c @@ -4681,6 +4681,11 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev, */ qdev->workqueue = alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM, ndev->name); + if (!qdev->workqueue) { + err = -ENOMEM; + goto err_out2; + } + INIT_DELAYED_WORK(&qdev->asic_reset_work, ql_asic_reset_work); INIT_DELAYED_WORK(&qdev->mpi_reset_work, ql_mpi_reset_work); INIT_DELAYED_WORK(&qdev->mpi_work, ql_mpi_work);