From nobody Mon Mar 11 16:12:05 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 4TthcQ33ygz5DF6t; Mon, 11 Mar 2024 16:12:06 +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 4TthcQ0R3jz4dGq; Mon, 11 Mar 2024 16:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710173526; 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=csH8jvCbMMXbn1GLq7VdsY0lG/7lVKp2ySCy8czWUmc=; b=XaQtdX+QO9jq38ehI8z6KQ7dtbCYfYjZw61xba6UF20hzexix7pc7zIC/R2b8EZr8hOlg9 9u2nryMwY4+GOsfa3DUMtfKQBbx9YH3GdFpQKO+ppIxYoQ5zO/K6BIboA4xqQlMZxvwAkB 1diGl3GXZPeFPCSD0oNJ6aNg3YhCXcYCagtMMd/EIHyDnMvIXIAEvsaK2YYiufc/uLy0wp k9QrsIIcuECnN8vEnxK+fzvY2jW3fBlUZbENF/Wuks8DChsprUs1cBrCOcXJbMmOUF8cPL UkocfSOsm0NpspYA5p9jlPby8z4rSiQsgUGcQ1pNOeBkS9BSFfeHK2Hd9eYS+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710173526; a=rsa-sha256; cv=none; b=MAxe/XfPYqiGowqQidWuSBDS5+gK09GVMurxKGUh+JrTcFmgiF5FDjtkCEgP6luy6yuULw MXvIWBQ+w/7Cd9BsrV9RIn7yecvxyJWDROCekosrDim1UWFNdsjnnCnmnNXalCpGWMKf3u POoAEw6AmDlBA464ziwWdVlfiFQgtMG+0U+i97JTRhve/y1PoL+ZLR1i1IFDlhEwGgDc8U DwQ43Aqb4XkN4VCM25Bp+1FjEYHV/BBAnwGKdDRbe4/9yxJmy6PRApEAg7U1qmYa1QA48R ULWu3OAL5f6rKcGuV1rpxtI1SxaQ4KN9XEM/3GzNSFQ6O0o3Zwh90ONYgBvx0A== 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=1710173526; 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=csH8jvCbMMXbn1GLq7VdsY0lG/7lVKp2ySCy8czWUmc=; b=cBBIVYGY7RUiQuR+wHbBncdo83Qty3vqHm6PU3qTmEXlvCrNhlupaRQEfWbS0U2rg2bYUL bj+VMzoznYF2dNtlPY4z2b/p+KGC2Rd7/qGihLx2hHwv63r9Y0BM934P87Hg+t3fOtz2MK oG+Egvkr31e63KQw1FTN7/cuzP45WJSs2gOImdoHyoWuXsCWQHUbwAX5ZxomtKNOKnt3me C3zOcRWuXnDCxDK1lUgGTlvO6CWi2IuOTzPgZ+Xc3joQ4qUw51CWpZ2Z6h6N51Yf+/R1BV lj8e0/Unyy0xPr5gueNRGKrib1LVs3LjS6U7tpBDh3/AYRTyVSdNwPPqET6cxQ== 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 4TthcQ02yJzcHC; Mon, 11 Mar 2024 16:12:06 +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 42BGC58K099193; Mon, 11 Mar 2024 16:12:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42BGC5T5099190; Mon, 11 Mar 2024 16:12:05 GMT (envelope-from git) Date: Mon, 11 Mar 2024 16:12:05 GMT Message-Id: <202403111612.42BGC5T5099190@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: f45ecf5fe407 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: f45ecf5fe4076fac300cd1e2e93877ff1762c93a Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=f45ecf5fe4076fac300cd1e2e93877ff1762c93a commit f45ecf5fe4076fac300cd1e2e93877ff1762c93a Author: Gleb Smirnoff AuthorDate: 2024-03-03 20:56:58 +0000 Commit: Gleb Smirnoff CommitDate: 2024-03-11 16:11:56 +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 569f9ffe1617..69849b1d98ad 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -253,14 +253,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); }