From nobody Tue Sep 13 11:37:58 2022 X-Original-To: dev-commits-src-branches@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 4MRhKg2x7Gz4c6hJ; Tue, 13 Sep 2022 11:37:59 +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 4MRhKg1nfGz3m3w; Tue, 13 Sep 2022 11:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663069079; 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=jNruY+b/5aC1LpwFi0xp3QXx6SBUzLYKTVjzcSp/lcM=; b=KjMYTYfUXXACPjfoGWwzBZDaVy0j/sx2IIeXBnp+HAl+vO9sTR/Mz4xkDHrw2gagSkALKS 42afGDen40wllK/iC4dn0bIvKmxNhbSUZ6L4Abk9FGJDKeKlOcB9hR403A6jtPIFe6m6uO dEC9P4Xmzqn9wmPTlmtTS6cNLTna+hOPyOs1Xg3v3IVI2UYp/s6OdIahlLKCVChDaDAisz lNn4ulQq6wz20g59bEUZ6l9UqE/w0ldtBWhkwzqOSBcgXRbZhwCQum0PBdY5nBKUXb5+rc zDLtdi5Umas9ifH6luVEzz70ujQbOzg6NkLjpT+hA41Gi0uDUBrQlIysOWx/eA== 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 4MRhKg0Yw8zK7X; Tue, 13 Sep 2022 11:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28DBbwQd094420; Tue, 13 Sep 2022 11:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DBbwno094419; Tue, 13 Sep 2022 11:37:58 GMT (envelope-from git) Date: Tue, 13 Sep 2022 11:37:58 GMT Message-Id: <202209131137.28DBbwno094419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tai-hwa Liang Subject: git: e0f305d9a99d - stable/9 - if_firewire: fixing panic upon packet reception for VNET build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avatar X-Git-Repository: src X-Git-Refname: refs/heads/stable/9 X-Git-Reftype: branch X-Git-Commit: e0f305d9a99d83a9d4dba7518459a978c67a0059 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663069079; 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=jNruY+b/5aC1LpwFi0xp3QXx6SBUzLYKTVjzcSp/lcM=; b=h0wulhxu03EX8fZTycf1RGZSzL3vPbU8KONPuemh8S9b88NAPSIm0szk8sln8v/GXi+igY a9WcbMu1iSv1CK5rHY1HeM7g1h9JNGMGbLIU6n0FU5NT0P11rqaKd8kW4f6UCMEHM1fxp3 snjwWkMr2LUo8eZUmBM/pT+4y7jV6gVxCPlh3mEhC+FXNgWGsEtsElDBsYAn/NrbzX6v4P zmolS3fuWwhT1UaxDjf+1Ttw50kFW/HWYEzd2NzPZu8yE2p2ODlR223jBS4jqMUsgUvp+9 O90RcQoJIlEU3OryPM5382Gy2ebgY7MODq+7vA+6VaiX5sKqud8YvXkOe//grQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663069079; a=rsa-sha256; cv=none; b=NRNjfscsxtTPfjADkI2kVv02tdyIk9RRmXGA8OJ6oywQYO7YgVSUegYM5QygqnDelOoCk6 37LiEkXTMKBsLF4pMR12O60PudMvV2RbC/Bj/9/jIwLw667WIn689ejRoc1EcRgfDq1Jxu 0HVdv+r0oOqLjl7zlipoitrr3Z4nocB9S5BPirjslVWQkA/25vRuWdDJOLAZXltZ9H8NIL 6tgy/7+pfOVBAI803yNUEgK3GAEQZKZO9o/ybXzg4zc97mQZ5CMzLHtUjZsNqZciVFf3ad rBuJCD1F2V3Rk3FM67PCkbA4ftczcmgbtPDzOBBeycvAusM4VHWoJvWFjQcXfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/9 has been updated by avatar: URL: https://cgit.FreeBSD.org/src/commit/?id=e0f305d9a99d83a9d4dba7518459a978c67a0059 commit e0f305d9a99d83a9d4dba7518459a978c67a0059 Author: Tai-hwa Liang AuthorDate: 2021-04-10 15:32:27 +0000 Commit: Tai-hwa Liang CommitDate: 2021-05-25 23:53:59 +0000 if_firewire: fixing panic upon packet reception for VNET build netisr_dispatch_src() needs valid VNET pointer or firewire_input() will panic when receiving a packet. Reviewed by: glebius MFC after: 2 weeks (cherry picked from commit d9b61e7153c64b141436b4d9619b166c6d35a0a6) --- sys/net/if_fwsubr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index 5414d792de04..06b940cac578 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -628,7 +628,9 @@ firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src) } M_SETFIB(m, ifp->if_fib); + CURVNET_SET_QUIET(ifp->if_vnet); netisr_dispatch(isr, m); + CURVNET_RESTORE(); } int