From patchwork Mon Mar 11 07:10:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 1054175 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="TZ6cXqJb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44Hq4x6qwLz9s55 for ; Mon, 11 Mar 2019 18:10:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726590AbfCKHKb (ORCPT ); Mon, 11 Mar 2019 03:10:31 -0400 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:53432 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725831AbfCKHKb (ORCPT ); Mon, 11 Mar 2019 03:10:31 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id CD46B9B8 for ; Mon, 11 Mar 2019 07:10:29 +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 HvEGbnzO9P3N for ; Mon, 11 Mar 2019 02:10:29 -0500 (CDT) Received: from mail-it1-f200.google.com (mail-it1-f200.google.com [209.85.166.200]) (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 9C70C9B2 for ; Mon, 11 Mar 2019 02:10:29 -0500 (CDT) Received: by mail-it1-f200.google.com with SMTP id q192so4244480itb.9 for ; Mon, 11 Mar 2019 00:10:29 -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=G7Fo7k82Ea3DfQt+/zMJOXlPOfcqxFsbS1ReXGKz9vU=; b=TZ6cXqJbPhLdjo8pzT1QkeF9P0O0U596fbz+1HwgwOWhHlVMsL+QNMoM/MOnfreW1j RadRCNMxXSSwgT58QrcUOlIK29/R20+Ztw4oHasRsNu/uC7m2RM0F5qLxoBJM2uMaqdH ynHASqHlPFPFls5oXKiG2S5d+3iSMpNm7/MKmG1cLi5pl0tBHAB3Ce2V+oS3FHA4nSa7 L10psHJiRMAUMMkMhLicMsdgC9vifv+/q4Z9q6YHRtn+NAQXGQHo/TF/yxzGmGsM4TJZ 452gd/c4YA1qohW3dAN8vgL8yYufcsFKbO1RpvkudatOsNWRVahSYnD8HiQhkX/KaQ10 RN5g== 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=G7Fo7k82Ea3DfQt+/zMJOXlPOfcqxFsbS1ReXGKz9vU=; b=Co5/sXEV70DnaiSJUgTNHvyTrUzgW9z2OUc7t93wxTdhx1fT6dBzq22EMyyRY1DJRP KUg1TqW5NRnE2Nwb8zgTJSS9Az6qivDS0QOYtk8h1AM8YPHGc+C3KlhOcBU7QWo4c2R1 /ytO6r8/KaJj/NW2iYk6p/KQIfBITSDwnEWxG2jhD3yIPD8QESwzV8rXKbroBWlYZZ9y UOoTu+j88R/CD4JB+mH7y09jevsID/26OVWVB/kINUZkdd0CKqcuLEUbxOXQB9FgZ8zl ck1ShOF9ZU5zKU4H6AhCHyr6PRFl1EN1pDJOLRnA/7opi5A0W70GcmHeoeuLPbzBuVwb Xiog== X-Gm-Message-State: APjAAAXFSTppwoQD5VkvhlrPKRuL1pA7RhIMLhtE5Ez/EQH03CTGHRrS gZ6oUUHXanSwo9grY9mjqZw8V6pRdr6P0LXsJQGdoYOk32TQ5NsHL++8XF0DKanfIYnt6k5gJFL pMfRb891QS4iPRG+Q/pIm X-Received: by 2002:a24:7c0b:: with SMTP id a11mr14929252itd.161.1552288229246; Mon, 11 Mar 2019 00:10:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqybi2rbyc2mnGigMR3e+StNBnyPRfi+Fmx9p6mHZ4a3Qt2TJrU+9gh3MXN7saj2pRnefqralg== X-Received: by 2002:a24:7c0b:: with SMTP id a11mr14929241itd.161.1552288228976; Mon, 11 Mar 2019 00:10:28 -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 c25sm1996198ioa.75.2019.03.11.00.10.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Mar 2019 00:10:28 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, "David S. Miller" , Colin Ian King , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: fjes: fix potential NULL pointer dereferences Date: Mon, 11 Mar 2019 02:10:21 -0500 Message-Id: <20190311071022.27610-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_workqueue fails, the fix returns -ENOMEM to avoid ULL pointer dereferences. Signed-off-by: Kangjie Lu --- drivers/net/fjes/fjes_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/fjes/fjes_main.c b/drivers/net/fjes/fjes_main.c index d3eae1239045..18c2c9e24c24 100644 --- a/drivers/net/fjes/fjes_main.c +++ b/drivers/net/fjes/fjes_main.c @@ -1252,8 +1252,17 @@ static int fjes_probe(struct platform_device *plat_dev) adapter->open_guard = false; adapter->txrx_wq = alloc_workqueue(DRV_NAME "/txrx", WQ_MEM_RECLAIM, 0); + if (!adapter->txrx_wq) { + err = -ENOMEM; + goto err_free_netdev; + } + adapter->control_wq = alloc_workqueue(DRV_NAME "/control", WQ_MEM_RECLAIM, 0); + if (!adapter->control_wq) { + err = -ENOMEM; + goto err_free_netdev; + } INIT_WORK(&adapter->tx_stall_task, fjes_tx_stall_task); INIT_WORK(&adapter->raise_intr_rxdata_task,