From nobody Sun Apr 2 16:54:27 2023 X-Original-To: dev-commits-src-main@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 4PqKr33WJgz43typ; Sun, 2 Apr 2023 16:54:27 +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 4PqKr32vqRz436H; Sun, 2 Apr 2023 16:54:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680454467; 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=M42SxJ2SK5cuXWvNaOUSVJWz9Jsn+OUaSeiJ5lC+nG4=; b=LAVd/tZQhSV10v4d15RJ2ALl43hQ0MYmbSO9HqwIwkccYyZK0iw+BdnLPp5QOjXCSHnyQF vHwiTaDwn2pWXU3L4zcNpOXfo9a1uBbjQ6RqMcKKyIWgj+qSL8cxJ6mtMESnJv8R60EWf1 U4jGSgvWbqRiu4QKHUOUv6m6mfc/xezVt19OhxJ8gzBMIuUxzVec5CSNr0X/IgceEB/gye WuNZdPZyuhWN/R3ghuxYv38nOvlrMlo4WpHMFjrUlBA9B3EQN6wW7ngAhjJ2ZuCnljjM0S xWHNgQRSOVoTx71Wtj/OgxkYlrKDCRwkSKaoxjAZ3IDQTz1QslD5eUl5/uOaQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680454467; 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=M42SxJ2SK5cuXWvNaOUSVJWz9Jsn+OUaSeiJ5lC+nG4=; b=vv+Fw6MTBfqkA+7VZVOt9AuQ5xzptIlsDO4mssKwIB0YGwAiXgF2zjLr5bg9Run6pumZN0 NeVzfkRjEe0iAFfxS4SINe29nYp7qDM2BGXqhy0iuUt75Qr1AH7tQcOatlDbJNzrXFO7vj SR9rbGw5cKSu/TE4G2PDgZCDtWZK93+DRxx0ZaBGM12S1ptWxDBkw1VxFtdqfBh+kkIKkx 5tx/aOKsvd6wZKCWHKoWUHnHCeQxAvLj6f/JrZbiSMpSh26nHhzTnvs6b+omH+SDXq649I 1ylEWqC/hDwj6oUdhjIi9R5yv/c9emQkQb2YCQeUBT0wmGaubNbu3DoYbkMpmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680454467; a=rsa-sha256; cv=none; b=OklsS74S2vsjcYrymAZjFlaPEkugjUXht57hOYmQdzWo9Z4WcyD4UgxOCJsfdtjW25d6nh rGWmXJcJi1J76LrXHQQfOTsrwZHfSJGSoaP6YwRgjXDGcHobpOlM181Hox/6WPISbKcTEz 12wmTrCpF6GnloUWehsnZAjuzagQnFmiKPAbRrDWgD5ZHyYytv5FUo9/+J0bfDFN9gEoxr olYv+2WLTEYXTuH6gvSkCDD0EIOQ+GZSD4X1AU+8ERcRAR/ljW2ZZ21pgyAonTNV9Qu9nD XIZsCU07yNkm5etlXHmSW2VBrS71lrxEgigpJr5B4mYUYD5zlOl7pvCjhQO9tg== 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 4PqKr31yWZzPWT; Sun, 2 Apr 2023 16:54:27 +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 332GsRVU013493; Sun, 2 Apr 2023 16:54:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332GsRMB013492; Sun, 2 Apr 2023 16:54:27 GMT (envelope-from git) Date: Sun, 2 Apr 2023 16:54:27 GMT Message-Id: <202304021654.332GsRMB013492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 90820ef121b3 - main - infiniband: Widen NET_EPOCH coverage List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 90820ef121b38479f2479c03c12c69f940f5fa33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=90820ef121b38479f2479c03c12c69f940f5fa33 commit 90820ef121b38479f2479c03c12c69f940f5fa33 Author: Zhenlei Huang AuthorDate: 2023-04-02 16:51:49 +0000 Commit: Zhenlei Huang CommitDate: 2023-04-02 16:51:49 +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 --- sys/net/if_infiniband.c | 4 ++-- sys/net/if_lagg.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/net/if_infiniband.c b/sys/net/if_infiniband.c index 6ca90ba1d8c7..b3cdd15c76f7 100644 --- a/sys/net/if_infiniband.c +++ b/sys/net/if_infiniband.c @@ -417,6 +417,7 @@ infiniband_input(struct ifnet *ifp, struct mbuf *m) int isr; CURVNET_SET_QUIET(ifp->if_vnet); + NET_EPOCH_ENTER(et); if ((ifp->if_flags & IFF_UP) == 0) { if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); @@ -504,10 +505,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); netisr_dispatch(isr, m); - NET_EPOCH_EXIT(et); done: + NET_EPOCH_EXIT(et); CURVNET_RESTORE(); } diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index cf78b55f4c34..b3475839a2c1 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2192,16 +2192,14 @@ lagg_input_ethernet(struct ifnet *ifp, struct mbuf *m) static struct mbuf * lagg_input_infiniband(struct ifnet *ifp, struct mbuf *m) { - struct epoch_tracker et; struct lagg_port *lp = ifp->if_lagg; struct lagg_softc *sc = lp->lp_softc; struct ifnet *scifp = sc->sc_ifp; - NET_EPOCH_ENTER(et); + NET_EPOCH_ASSERT(); if ((scifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || lp->lp_detaching != 0 || sc->sc_proto == LAGG_PROTO_NONE) { - NET_EPOCH_EXIT(et); m_freem(m); return (NULL); } @@ -2214,7 +2212,6 @@ lagg_input_infiniband(struct ifnet *ifp, struct mbuf *m) m = NULL; } - NET_EPOCH_EXIT(et); return (m); }