From nobody Mon Jul 31 12:56:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RDytJ2VXXz4q6XQ; Mon, 31 Jul 2023 12:56:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RDyt545C2z414S; Mon, 31 Jul 2023 12:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sdr1oihkSI/J7j0WOtIloIZZ8Us+nH8bvtJUhaeChi0=; b=JsJ845xKgcjpNRd7gkQHLkVC5T0umoEUAbpQGjAdwet3BaZ50A/ts5ri3kar7UqmRalHuK m38AGNVCCBAARR9G6OkjTmg4HWpIKB9Pmq8wExTUpYDpbUUXw+UdLlLeKeDaccV6SN03pH Q5ZB3IuzjG8VlWCiRjrDmfyniVyIoGsiBLoaVfmD6Q1pBGuKs5KkZJbYMypuICno07St66 J+bbUccvbyMsPYcUdj7MP5PtzerP8MFOC0Kp652yetaFc2ySHY1RqmuGRO+mpFYb/aamu0 FQWYrFMlY7GEcjEKAjc1aCi/l8jigLmTSa4PzpSywjwkiCwm4J4TEDoZUYgI4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690808189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sdr1oihkSI/J7j0WOtIloIZZ8Us+nH8bvtJUhaeChi0=; b=mUM9AqmsM2+k6SCOLZuIqcSwQJ9K6gn9WP/pAh4T2wlzKG80ylJpM7nf37Czs2S4XYoVKs yZe4GeapyU0IenthAnMsd/44aI+EFAOZSJP4YrvjYitzMBVfGWU9kpNsgTRYy5JIK0APPc 5IvjMYP1N0TIRc/N17/Ti3P22o1lF9BzyEXU6bgDKPOYxxYUhrspwIFAur4qKKERD3S2Fj uJ+flibMpyJGeAVHXDpwfZnqbj37SnptPPOYF4NI2Kqtp1DSqA0Ijo5Z8VEuySaYbTdidL jsg5tkANkw1sCVJyDubr1qc1ZXKPqPJE0o15cd2TMlarflnYauYBpWv3q7AWpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690808189; a=rsa-sha256; cv=none; b=R5Y2pyiyaIhxpXPsGIl6xZrWZCYBFGoBhKmP2rAkhuOXJnh1tXCyLGEWOMjjAuSObWeKeX j3146YG1SYV/ItObyw3ZES1zPtlGRLhC9qHVWnjZLftCOVP0XolC2uuOz42LGXPJsmZXF0 syr4065xYikQ83+buztUpt/6GpoN72tUsSpENN76wW59wxSTMU4b3i6EdQnUQWMZfX9/E7 c4fjz/w83PT1/wcU2i3s1B19BKAb+vPwXrbziEBFAXVUgh2HsT5BRxCJYCL03T/byaWdNW xF+YIeJ3K7/OiiC4oRrCFNCiVpJuZByLNSvhk/8MQ1dePyRXpM7KWp5qoJ1a9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RDyt40VMMzwxd; Mon, 31 Jul 2023 12:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VCuRi7093349; Mon, 31 Jul 2023 12:56:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VCuRn2093348; Mon, 31 Jul 2023 12:56:27 GMT (envelope-from git) Date: Mon, 31 Jul 2023 12:56:27 GMT Message-Id: <202307311256.36VCuRn2093348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: b390fe1d806a - stable/12 - ena: Fix driver unload crash List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b390fe1d806a56ee8c8b6d57c7d47ca288f20337 Auto-Submitted: auto-generated The branch stable/12 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=b390fe1d806a56ee8c8b6d57c7d47ca288f20337 commit b390fe1d806a56ee8c8b6d57c7d47ca288f20337 Author: Arthur Kiyanovski AuthorDate: 2023-05-21 12:31:54 +0000 Commit: Marcin Wojtas CommitDate: 2023-07-31 12:49:58 +0000 ena: Fix driver unload crash When ena_detach is called, we first call ether_ifdetach(), which destroys internal addresses of ifp. One such address is ifp->if_addr->ifa_addr. Then during ena_destroy_device(), if_link_state_change() is called, eventually trying to access ifp->if_addr->ifa_addr->sa_family. This causes an access to garbage memory and crashes the kernel. Ticket [1] was opened to the FreeBSD community to add null check in the code of if_link_state_change(). A fix was submitted in commit [2], however it was noted that it is our driver's responsibilty to not call if_link_state_change() after calling ether_ifdetach(). This commit makes sure if_link_state_change() is not called after ether_ifdetach(). [1]: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270813 [2]: https://reviews.freebsd.org/D39614 Fixes: 32f63fa7f975 ("Split ENA reset routine into restore and destroy stages") MFC after: 2 weeks Sponsored by: Amazon, Inc. (cherry picked from commit c59a5fbd8a2ef68ed0842cbb1df4450edd654129) --- sys/dev/ena/ena.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index c8c12593fcd1..b157be9ada88 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -3296,7 +3296,8 @@ ena_destroy_device(struct ena_adapter *adapter, bool graceful) if (!ENA_FLAG_ISSET(ENA_FLAG_DEVICE_RUNNING, adapter)) return; - if_link_state_change(ifp, LINK_STATE_DOWN); + if (!graceful) + if_link_state_change(ifp, LINK_STATE_DOWN); ENA_TIMER_DRAIN(adapter);