From nobody Fri Jan 17 02:31:54 2025 X-Original-To: dev-commits-src-all@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 4YZ3f30gl4z5kGNC; Fri, 17 Jan 2025 02:31:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YZ3f26dDYz3c0Y; Fri, 17 Jan 2025 02:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737081114; 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=Eu55K+fdjyf//fBBFl2q4GF4SdEgHOW7TghZty3JutY=; b=R/RhWyDVM4MqgZUg2VZr4ht2sIyIF9y5InzqhixCLRVB0L/DQvfnBqx2OjAPBuFiJgv6dD AAmtKZKHpQ64LAzAdGOoy8c/sNgdUh5NHzZ3L9wcBwqTubcG2aGeDoju7Bn1dwCPVOgmJ0 BYYLSHTpod3wodiLWEULs2fmCmquYaXpZxVMSf3cyHdx9H2Ea9SBIPM7IemfuBw5c/N4Bu TKeqQaqJ+LnSuJqPBMrSxF3s78de1y+r5qZOXuCwu6SFzv9X32Fqh8MXcdJByhx5YeJfTK AVbOSzPZh50J0cIHuiZuyzZvhU6b6fqZiNeTuZ1ak9BhD8pfpHUQ0g7ygzMurA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737081114; 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=Eu55K+fdjyf//fBBFl2q4GF4SdEgHOW7TghZty3JutY=; b=EI5FO0jW9FWH/+NuKjhN0phfcUv2/En/LmiGX4b2lhFMqb71IH6wTKQnZQbmc0qXeHlZ/C 34f1ZTjZF6IV40+KiuZoPVhwQcMtXMkWQAmLXp5UDSMCc6pLFbpUqhk4fBWqBRmuo1t1U1 7FL1i7MmjzW3w9qLfZhTcbPscjAXnGWqHOre29+NG/kaDGpgFldp5SCSBFnf7qKtW7lyFI aS2UAYNnUk/T+Jp6+XBvtZ5KiwjhI6rfB98XPCILhfq+cvw6fIyMfNiMPv67RMniKYDaZA oFbxRYGTNpWP/T+kj2gZYU/er3DpCfIi/rpGJ9Bnj9tbZ4FwxLWpSUYpXwqhpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737081114; a=rsa-sha256; cv=none; b=ujqOg9WbUAQ0mKmaMNzwcmGpXRMY0gb2C9acKuSrSfLnlNsut554Docga1PFvrIlYJu9qM AtYcUa2V1XghQhWlW5qORu0I3XOMoBni8E3Ip2S5N1Fxery1Fgp2xmTJ4fkdMN3KTVYd/+ 5FmLBs1ItH3JTtlLC+nK3UdWy7rPxLwULw2nMn+cDYpj1Y5MIfnUpZ4ZGMY5BQPbfE/FhI bw+spUttQw70JSb9cY9a/jGUXHXa033kQ5gKiRZwTUnOLSnLIQ7F6aL6GYCQI+wwAmx1KR TQBQti0b6DmFJe4NzmsUHAEsrmpZ62QNI+0YXKW02LM6rWzu1ijggYSNBpD9Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YZ3f26DQPz106k; Fri, 17 Jan 2025 02:31:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50H2Vsls044419; Fri, 17 Jan 2025 02:31:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50H2VsT1044416; Fri, 17 Jan 2025 02:31:54 GMT (envelope-from git) Date: Fri, 17 Jan 2025 02:31:54 GMT Message-Id: <202501170231.50H2VsT1044416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1e9bca400b9c - main - sockets: assert VNET set in sopeeraddr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 1e9bca400b9c7ae3dc3f31aa48df69cf2259e16c Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1e9bca400b9c7ae3dc3f31aa48df69cf2259e16c commit 1e9bca400b9c7ae3dc3f31aa48df69cf2259e16c Author: Gleb Smirnoff AuthorDate: 2025-01-17 02:31:15 +0000 Commit: Gleb Smirnoff CommitDate: 2025-01-17 02:31:15 +0000 sockets: assert VNET set in sopeeraddr() Most callers already have the context set, it was only bare syscall that needs it to set. --- sys/kern/uipc_socket.c | 4 ++-- sys/kern/uipc_syscalls.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 426316ac6ce8..46a7053f2872 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2030,11 +2030,11 @@ sopeeraddr(struct socket *so, struct sockaddr *sa) #endif int error; - CURVNET_SET(so->so_vnet); + CURVNET_ASSERT_SET(); + error = so->so_proto->pr_peeraddr(so, sa); KASSERT(sa->sa_len <= len, ("%s: protocol %p sockaddr overflow", __func__, so->so_proto)); - CURVNET_RESTORE(); return (error); } diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index e0bb7ace92c6..91fcdf9a7a9d 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1433,7 +1433,9 @@ kern_getpeername(struct thread *td, int fd, struct sockaddr *sa) error = ENOTCONN; goto done; } + CURVNET_SET(so->so_vnet); error = sopeeraddr(so, sa); + CURVNET_RESTORE(); #ifdef KTRACE if (error == 0 && KTRPOINT(td, KTR_STRUCT)) ktrsockaddr(sa);