From patchwork Sun Nov 26 14:10:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: claudiu beznea X-Patchwork-Id: 170036 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp2904173vqx; Sun, 26 Nov 2023 23:15:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IELsY/TzQA4dKQ8CtEvXAjrd/GL9cNy6nWQ/hngbmMvXzLNMTJ4LUYXxJHx4AbvzoLOzQxo X-Received: by 2002:a05:6a20:d495:b0:18b:386a:46a5 with SMTP id im21-20020a056a20d49500b0018b386a46a5mr11241757pzb.17.1701069313280; Sun, 26 Nov 2023 23:15:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701069313; cv=none; d=google.com; s=arc-20160816; b=kBwsueP1c0BkPs4h9nEODDKHpfZ1/Dy3ymw2jZCQqcd03Dpizb0s6zaJhu+ijOJF5+ 2SlngSKh6XTCEbtB7WMI3gx3xmUCJl48f+7UdPvqR2NrWWM/0CPVKL91DUKx8DDtKkAL h478NeN0Efhpedk378wOo3mxR8SSMRV9Rp0ICHzruux8zVPRbGlzU54LnefcTpxaW/Db ZHOfozR84aGHQRt5NIaOqDlkg0u+FNnLMsNgzby6v9sU9AyGMSitKq6BcqpVdpmaJ6Fg 1dvQkz5oq+eFWE9dNygT8+9Ofz5QERCHHi1nvLdaLPY39gt1DKYV0yfHZvwsP5Tbg5tN fW8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Vf3BBbGgK38KEJry5f+skZG4ReehlnPep5PbY6SoWGQ=; fh=LFcv2OHzfpz/VcIjGaAV3U9+3Y1V0RaOGvgbSTwNd8g=; b=WEATYYLKLD00UQ480mG60Zlt0SwgOas2HYVuaeKvDpYXUf2a+cjS0pVGsz1LtZexL7 c0eYoZfvxnUGrVc4SEM1q3kHc4c3ExxwIZNYwYm9fDc3K6Iyg0YL9PWovXNHVYHF+Yr4 KbTlhqdyfdtrkYmHKMj4E3oeq9FxUcZ2t4ANsDaLkaUU6FrZR1po9huUDomzh1dBvSZv A58X9lKe5LNOlOpiH/roGTx8W29mJblv1UrwvoZ30F+yo5fKNB2KnWmFl0Jo8yHMzxoA rgjToALavPf4VAZX4EKwlHbZsE99zmoY8oxv6GWIz8O0MXrTaQ7AlgQCaSJCNjq+6B9f vMBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=CFYFTrSx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id k4-20020a170902c40400b001c430af53b8si10019187plk.574.2023.11.26.23.15.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 23:15:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@tuxon.dev header.s=google header.b=CFYFTrSx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 237CE806115B; Sun, 26 Nov 2023 06:15:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229843AbjKZOOv (ORCPT + 99 others); Sun, 26 Nov 2023 09:14:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51146 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229996AbjKZOKs (ORCPT ); Sun, 26 Nov 2023 09:10:48 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38725FC for ; Sun, 26 Nov 2023 06:10:53 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-549070a04baso4579344a12.3 for ; Sun, 26 Nov 2023 06:10:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxon.dev; s=google; t=1701007851; x=1701612651; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vf3BBbGgK38KEJry5f+skZG4ReehlnPep5PbY6SoWGQ=; b=CFYFTrSxcrA8TfeWR3G1Y5sOoDm20rR8R3NFf7ESSCc1n4ILNyrT7g0Y6sTs38NX3S jUW8ttrPG+5UZ4PbQKYpoESwyo5BSFnVjZSMrCiS3iD6nd/Ys41qcLD2deUV0fVNz/9X wGjcLv2FrQiB9qz7albIHwfi51Rr/dBofveH27wAjBhFmi4iCzkuTSjgBDl+zc4FTJT3 9f/PiDwuLdQxMKvLL9r2djR9lY5Ad8cucSlmk8SZwQSSKSfiUvHc56mnOKp/LbRsLWqJ 1nDqoLj1CNesd3K+MAl3vzxIoVh53/xip0H+gwRNY4x+0v8esbFbCKYBPM5aa9O/0TnP w2Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701007851; x=1701612651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vf3BBbGgK38KEJry5f+skZG4ReehlnPep5PbY6SoWGQ=; b=WuZaBt4KGPcc/NIMAw1eqKfPBKRnubGFT7aJx+7VwyyYbAjNzfu/yk4rZ0LSLw4NPt ruimV3Nwq9yVB6UuJt0n4qpDe91fB0qlXkzQXHJE4ccYJSzxG8ar1sjwndMZFMrGHAOv BfWRoj05z3LNPnccPI/OlATfHZ0kx692nXDESDe1mNnJhmy9r4+UpKRSTTuBHAdNoD86 QQsctPj3iDRHU0RHWlI7Spk4J6GMoqnR/B/uqS5cbay2Nd5ZBBa4lo+m2usOSgem0MEA BN2NFGWNCIV47DlVb/+2QSq5x2/DIy1XgxX+lyDh/G0BA11sh/LXY2mZdYZaYGGRLsua 2kSA== X-Gm-Message-State: AOJu0YxxSnbwWM5YFXNThpEcack5bxv+CjptqY/ji9HPfShF3xnGx5A4 okhDv5UMENiosoaEbgO34q2Gsw== X-Received: by 2002:a17:906:4e:b0:a0d:a567:b92a with SMTP id 14-20020a170906004e00b00a0da567b92amr1525873ejg.39.1701007851676; Sun, 26 Nov 2023 06:10:51 -0800 (PST) Received: from claudiu-X670E-Pro-RS.. ([82.78.167.125]) by smtp.gmail.com with ESMTPSA id mb22-20020a170906eb1600b009fc0c42098csm4603423ejb.173.2023.11.26.06.10.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Nov 2023 06:10:51 -0800 (PST) From: Claudiu Beznea To: nicolas.ferre@microchip.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, andrew@lunn.ch, hkallweit1@gmail.com, linux@armlinux.org.uk, jgarzik@pobox.com Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Claudiu Beznea Subject: [PATCH 1/2] net: phy: Check phydev->drv before dereferencing it Date: Sun, 26 Nov 2023 16:10:45 +0200 Message-Id: <20231126141046.3505343-2-claudiu.beznea@tuxon.dev> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231126141046.3505343-1-claudiu.beznea@tuxon.dev> References: <20231126141046.3505343-1-claudiu.beznea@tuxon.dev> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Sun, 26 Nov 2023 06:15:02 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783642453664096314 X-GMAIL-MSGID: 1783700456466661550 The macb driver calls mdiobus_unregister() and mdiobus_free() in its remove function before calling unregister_netdev(). unregister_netdev() calls the driver-specific struct net_device_ops::ndo_stop function (macb_close()), and macb_close() calls phylink_disconnect_phy(). This, in turn, will call: phy_disconnect() -> phy_free_interrupt() -> phy_disable_interrupts() -> phy_config_interrupt() which dereference phydev->drv, which was already freed by: mdiobus_unregister() -> phy_mdio_device_remove() -> device_del() -> bus_remove_device() -> device_release_driver_internal() -> phy_remove() from macb_close(). Although the sequence in the macb driver is not correct, check phydev->drv       before dereferencing it in phy_config_interrupt() to avoid scenarios like the one described. Fixes: 00db8189d984 ("This patch adds a PHY Abstraction Layer to the Linux Kernel") Signed-off-by: Claudiu Beznea --- drivers/net/phy/phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index a5fa077650e8..dd98a4b3ef81 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -165,7 +165,7 @@ EXPORT_SYMBOL_GPL(phy_get_rate_matching); static int phy_config_interrupt(struct phy_device *phydev, bool interrupts) { phydev->interrupts = interrupts ? 1 : 0; - if (phydev->drv->config_intr) + if (phydev->drv && phydev->drv->config_intr) return phydev->drv->config_intr(phydev); return 0;