From patchwork Sat Apr 2 02:58:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qianfan X-Patchwork-Id: 1612454 X-Patchwork-Delegate: rfried.dev@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=qe+wpbDv; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KVhZv3tK0z9sFv for ; Sat, 2 Apr 2022 13:59:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22DF683093; Sat, 2 Apr 2022 04:59:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="qe+wpbDv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B64C182A3A; Sat, 2 Apr 2022 04:58:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,T_SPF_TEMPERROR autolearn=ham autolearn_force=no version=3.4.2 Received: from m12-16.163.com (m12-16.163.com [220.181.12.16]) by phobos.denx.de (Postfix) with ESMTP id 6B37981FBB for ; Sat, 2 Apr 2022 04:58:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=qianfanguijin@163.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=PHhgAjJOmHMyJrhkME 5wJnC7ufqeNOQvFoM9gis5KSo=; b=qe+wpbDvht24Qxx7JpBI79RcujVphUIV38 u3iaF7sXa3dkJqI2ShQne6878hzwH7FIPwjFxgQyTZ4xBBgFJGSrBC47GIX+LNP+ NsGeEFRhDVCjhSFmLt8umtYxO3RfkROmZrBch8FkvR2NEI6OTJ93dHkwBNHxbTwL YzSANW2tI= Received: from localhost.localdomain (unknown [218.201.129.19]) by smtp12 (Coremail) with SMTP id EMCowADXG2neu0disH8CAA--.310S2; Sat, 02 Apr 2022 10:58:40 +0800 (CST) From: qianfanguijin@163.com To: u-boot@lists.denx.de Cc: Joe Hershberger , Ramon Fried , Matthias Schiffer , Heinrich Schuchardt , qianfan Zhao Subject: [PATCH v2 1/2] net: eth-uclass: Fix eth_halt Date: Sat, 2 Apr 2022 10:58:35 +0800 Message-Id: <20220402025836.19374-1-qianfanguijin@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: EMCowADXG2neu0disH8CAA--.310S2 X-Coremail-Antispam: 1Uf129KBjvdXoWruw1UJw1DAFyUArWrKF4xtFb_yoWDGFX_Wa yxZFWvqr4rXF1qkFW7ta1rZ34I9w4kAr4fu3WDKFZakF9rtw15Xr4kJr9xCr47ur4YkF90 qrnrJFy7Jw17ujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRABMMPUUUUU== X-Originating-IP: [218.201.129.19] X-CM-SenderInfo: htld0w5dqj3xxmlqqiywtou0bp/xtbB2BDW7WBHJj49fgAAsP X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: qianfan Zhao eth_device_priv maybe unaccessable after @stop handler due to eth device is removed in @stop, touch it will trigger data abort. Fix data abort bug when run dhcp or tftp command via usbnet. Signed-off-by: qianfan Zhao --- net/eth-uclass.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 0da0e85be0..2b88b6c145 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -339,8 +339,15 @@ void eth_halt(void) return; eth_get_ops(current)->stop(current); - priv->state = ETH_STATE_PASSIVE; - priv->running = false; + + /* ethernet device maybe removed when @stop handler, that will cause + * @priv is freed. get private data again to avoid it + */ + priv = dev_get_uclass_priv(current); + if (priv) { + priv->state = ETH_STATE_PASSIVE; + priv->running = false; + } } int eth_is_active(struct udevice *dev)