From nobody Mon Apr 10 05:08:03 2023 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 4PvxnJ30fjz44mwy; Mon, 10 Apr 2023 05:08:04 +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 4PvxnJ0ZWCz3Q1l; Mon, 10 Apr 2023 05:08:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681103284; 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=yJM/HohDKsTRWWz2O6DDFqt1bUi7UdBFe9J3eig7uRQ=; b=Nxh5/64VxVOgQcPvEuh3F307QvnHRvCzfJQtQIuEMNN6aJkEh8QLhUec373kXgok8Dg0Da WkoXv7kFIzi3EmQDw0R2KyT2jHb/3ynUrIfstpYqUdqwGyMCQfxY7LPcLaOo97uHgJafHY oheX48aaeMe8li2gcQSZr/dVnDdFSHaXZJWzz6qJd8ptPP0yrpjOWKOp0sQGkoUILzN8jy SgUDTBoCwi465pnLFZm8GRiyAgS5uXDwDgI5uC1APAKGnqpIjcvt7CpJ1fe1zPyU8WG3Dh FOOomUmJtiuV4Kis/DUiOZ+xUaxMJMTP06386MHZS+9iwmmkNQM6AA0qgBFS4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681103284; 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=yJM/HohDKsTRWWz2O6DDFqt1bUi7UdBFe9J3eig7uRQ=; b=PSvGBpm6/V7ShmD0BqZVJkLUFMus7YWKj7QYrWdLqcd8kXOXQCiW9XDf/c4dHgMg13FiON qObEYn5f1Jkqw4KJm6yz8v4HtyIpTiAgQ3BpRif7YcHY6ieX5UXG4yBykyOLWU2vHSMOOh q0CRZcQhCKVjv9klZwTZjlahKN6cLDcHl2Wy2ISBhXYbAocNa1cytYSyIou4hl7wzi/hHL Qm5/5C6OQwb5lGojRjGQWk5myCEf4w1NX8nJb3REUKE8KhrnVyH6IgUbtwM/RvgM+oWuk4 ORq/TNSOT5ElwpQm+KDpmYkoWX4vKsul023ppvLNLAmvgp/pFj7IuZDxkS93FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681103284; a=rsa-sha256; cv=none; b=jxiKQO4JvJk25jhGALZ4ZjHh2KY9OS2yycHWfP/EwmqdbC/YurCXUMkgNGFNx3OK08pC4t grBS20IooRaHHVKzLTrPakT2pP8T5y3YtEijhLCkTeczfkC55tH4+I4/g8059EtO8EBrpt yZHxONgLz4nXquRtHmIWWc0oWGY2i93Batk7Z4FFqilLFyfEiX8mBV54lbTc6Tir2Lax5k sBbtz2KwBPukOgbII5w2vp5L6/v5UBkSlZ3O82rLdh+WMqaz9BZovBy0051qFaHqx1Pa7Z HmnGxuuDNUSGs3mWunoN6bPlBqXczL0seR2vyVPwXKfhJ3ntKGwE3N9MJubbTw== 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 4PvxnH3VlGzcn3; Mon, 10 Apr 2023 05:08:03 +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 33A583qP022240; Mon, 10 Apr 2023 05:08:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33A5838P022239; Mon, 10 Apr 2023 05:08:03 GMT (envelope-from git) Date: Mon, 10 Apr 2023 05:08:03 GMT Message-Id: <202304100508.33A5838P022239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 24069f0dc073 - stable/12 - infiniband: Widen NET_EPOCH coverage 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 24069f0dc0730248bd5b09e50b12e37645d57c31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=24069f0dc0730248bd5b09e50b12e37645d57c31 commit 24069f0dc0730248bd5b09e50b12e37645d57c31 Author: Zhenlei Huang AuthorDate: 2023-04-02 16:51:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-10 05:06:22 +0000 infiniband: Widen NET_EPOCH coverage From static code analysis, some device drivers (cxgbe, mlx4, mthca, and qlnx) do not enter net epoch before lagg_input_infiniband(). If IPoIB interface is a member of lagg(4) interface, and after returning from lagg_input_infiniband() the receiving interface of mbuf is set to lagg(4) interface, then when concurrently destroying the lagg(4) interface, there is a small window that the interface gets destroyed and becomes invalid before infiniband_input() re-enter net epoch, thus leading use-after-free. Widen NET_EPOCH coverage to prevent use-after-free. Thanks hselasky@ for testing with mlx5 devices. Reviewed by: hselasky Tested by: hselasky MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39275 (cherry picked from commit 90820ef121b38479f2479c03c12c69f940f5fa33) (cherry picked from commit 5d45e09d50e648a75667c9b12b204eb62fa60ed2) --- sys/net/if_infiniband.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_infiniband.c b/sys/net/if_infiniband.c index b644f91f2cda..3fe4fb0616e8 100644 --- a/sys/net/if_infiniband.c +++ b/sys/net/if_infiniband.c @@ -407,6 +407,7 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) int isr; CURVNET_SET_QUIET(ifp->if_vnet); + NET_EPOCH_ENTER_ET(et); if ((ifp->if_flags & IFF_UP) == 0) { if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); @@ -494,10 +495,9 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) mac_ifnet_create_mbuf(ifp, m); #endif /* Allow monitor mode to claim this frame, after stats are updated. */ - NET_EPOCH_ENTER_ET(et); netisr_dispatch(isr, m); - NET_EPOCH_EXIT_ET(et); done: + NET_EPOCH_EXIT_ET(et); CURVNET_RESTORE(); }