From patchwork Wed Oct 21 07:33:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Defang Bo X-Patchwork-Id: 1385423 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=126.com header.i=@126.com header.a=rsa-sha256 header.s=s110527 header.b=Kd0PXqQD; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CGNQr6xXTz9sRk for ; Wed, 21 Oct 2020 19:08:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502164AbgJUIHx (ORCPT ); Wed, 21 Oct 2020 04:07:53 -0400 Received: from mail-m964.mail.126.com ([123.126.96.4]:54270 "EHLO mail-m964.mail.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407580AbgJUIGL (ORCPT ); Wed, 21 Oct 2020 04:06:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=eictmf52OPpcOGd4A4 gKYbSSk3VTWSCn1R/rLn4YWto=; b=Kd0PXqQDD3NT49s1aE7PIISCuzbmjOoUiL dyY/RzBnXOLZTHhYc8DUWIGJLK0BSSFsBAGLQolPWe1emQxXFPpehPxGUow4cBES a3+jUzr8cRTp4R8JqMGh9yJIIbeWlW9IrMlYsQ0O4iqysB//m5kt9aJonb9RF2Wj U4SSIBog0= Received: from localhost.localdomain (unknown [36.112.86.14]) by smtp9 (Coremail) with SMTP id NeRpCgAXEgRO5I9fcz9fMQ--.11117S2; Wed, 21 Oct 2020 15:33:35 +0800 (CST) From: Defang Bo To: siva.kallam@broadcom.com Cc: prashant@broadcom.com, mchan@broadcom.com, davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Defang Bo Subject: [PATCH v2] tg3: Avoid NULL pointer dereference in netif_device_attach() Date: Wed, 21 Oct 2020 15:33:22 +0800 Message-Id: <1603265602-8887-1-git-send-email-bodefang@126.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: NeRpCgAXEgRO5I9fcz9fMQ--.11117S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrKF17trW7Jw17GFy5Kr1xZrb_yoW3CFX_KF 1UZrZ3Gr4UGry2kr4Ykr43Ar98Kan0vayF9F1Iv3yaqrZF9r1UJFWkZryfArnrWrWUtF9r tr13tFWfGw4jkjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8PKsUUUUUU== X-Originating-IP: [36.112.86.14] X-CM-SenderInfo: pergvwxdqjqiyswou0bp/1tbitArE11pEBwQX1QAAsy Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Similar to commit<1b0ff89852d7>("tg3: Avoid NULL pointer dereference in tg3_io_error_detected()") This patch avoids NULL pointer dereference add a check for netdev being NULL on tg3_resume(). Signed-off-by: Defang Bo --- drivers/net/ethernet/broadcom/tg3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index ae756dd..345c6aa 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -18099,7 +18099,7 @@ static int tg3_resume(struct device *device) rtnl_lock(); - if (!netdev || !netif_running(dev)) + if (!dev || !netif_running(dev)) goto unlock; netif_device_attach(dev);