From nobody Mon Mar 11 16:12:53 2024 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 4TthdK2ZR4z5DFdM; Mon, 11 Mar 2024 16:12:53 +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 4TthdK21TQz4f2b; Mon, 11 Mar 2024 16:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710173573; 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=uYEmVXhF65rG0EOYq+gPcJA0eYn1KFPNDZpxmoC1OjU=; b=ELYPlbdYZudOhH99wGBpoOqjhuz5se/ecDy3voxvaFfttHU+HsqTEpxuwfZ7Rk06eb5jC9 goVw9bWzSbHEBP72nnaGuE4JhN5GqThbjNf6aaVDed8faWHnOnOK4eJA6gmM17i/oh9Z3u kTLaAug5lVGRnwg90suOYAvR+29xmnDuwcWTm/SsdDt3HAj0xG88nbw09RRILmkrj1km8k D3y2iisXqwXhSSLQlbxHXasWBENR5MouaKhHoBCj2cX9UcGJ2v2wmNLQgPqyX0KzMo5TqJ J2+89UFHyoyDC7a37W4o/yNb6V5q4vkR2EkuOCMObY3jWuNcH8dXeD/xsVTOLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710173573; a=rsa-sha256; cv=none; b=U9tq6g7byrhsZFCC73fA5jnqJiQdZYikx0sjvHuJhx/iRAtpl/pnGC4rCXIugif2mXut3q 7C3sVybmjSbgTzLY0bL/44rr0qjmlrrT+MTSac8gLOIEgPqvQ+lQGWMwtIIxKMuJASt3nB sGNwf7+taGOoyrkIeaEVWRU4FD3Qzc2U4iCplMszedwWAAQobOeiZ7g2kfdaUZspsQC3B2 JnklYFc1CA9lMwwTWWRBpqjXP2tMhSMoeTWK2uTMgxURHSBPMvUke8JD0yesFWI89/Funm lS0L/LS81ooQz26klt4Sh9Xyf8t+QJv26mB5IC3njtn+M9zKDTzuEtE79XGnZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710173573; 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=uYEmVXhF65rG0EOYq+gPcJA0eYn1KFPNDZpxmoC1OjU=; b=nYtx7JbYu08hm98qSQGEzrWkybMAO/EUxiDyL5XBThRLLG9KycyGj1rw8ywTjVFbWiIRRD jfMKRIw4l9tS5QdnipfJXV01s7cReFFNAbclXUgQcZ2v6HoLzsvHA5uBPLz1vbax4q8sOD luYsSJONG1+v2xpsIZw7RquBN+7Q3a+5sSm4JYSA0EdMsObazO7lRHg3/ehCEjdWNs1Vsg gkyHkk/B4hm0ekGO5p53HxvPbOE6mua5aLKhwMkeEWIUMVGbpQIbOKUQimKZStxDleeVQ5 PH7lemzWDRZZqFfmgQH/PsUTf3dN9EjU6has755CQLLyOdpmUbpsaWiYP33Qrg== 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 4TthdK1dWNzcm2; Mon, 11 Mar 2024 16:12:53 +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 42BGCrjh000299; Mon, 11 Mar 2024 16:12:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42BGCrZd000296; Mon, 11 Mar 2024 16:12:53 GMT (envelope-from git) Date: Mon, 11 Mar 2024 16:12:53 GMT Message-Id: <202403111612.42BGCrZd000296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: db4429d00f0d - stable/13 - linux: require vnet(9) context in ifname_bsd_to_linux_name() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db4429d00f0d95a1532f8707f8b828a744586dc7 Auto-Submitted: auto-generated The branch stable/13 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=db4429d00f0d95a1532f8707f8b828a744586dc7 commit db4429d00f0d95a1532f8707f8b828a744586dc7 Author: Gleb Smirnoff AuthorDate: 2024-03-03 20:56:58 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-11 16:12:36 +0000 linux: require vnet(9) context in ifname_bsd_to_linux_name() This function is used by netlink(9) only. The netlink(9) taskqueue thread runs in the vnet of the socket whose request the thread is processing right now. This is a correct vnet and resetting it to vnet0 is incorrect. If the function is to be used by any other caller in addition to netlink(9), it would be caller's responsiblity to provide correct vnet(9). Reviewed by: melifaro, dchagin Differential Revision: https://reviews.freebsd.org/D44191 PR: 277286 (cherry picked from commit 2f5a315b307447f91891c96fb23c7333fa406f2f) --- sys/compat/linux/linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 6191372b6312..141fa715c7c1 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -250,14 +250,14 @@ ifname_bsd_to_linux_name(const char *bsdname, char *lxname, size_t len) struct ifnet *ifp; int ret; + CURVNET_ASSERT_SET(); + ret = 0; - CURVNET_SET(TD_TO_VNET(curthread)); NET_EPOCH_ENTER(et); ifp = ifunit(bsdname); if (ifp != NULL) ret = ifname_bsd_to_linux_ifp(ifp, lxname, len); NET_EPOCH_EXIT(et); - CURVNET_RESTORE(); return (ret); }