From nobody Mon Mar 31 17:44:15 2025 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 4ZRJR3332vz5sLbL; Mon, 31 Mar 2025 17:44:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRJR31mMtz3hX2; Mon, 31 Mar 2025 17:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743443055; 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=WDyr9uKwKuuME6fAIXjOLrMNegmipEexMREA56GN4I0=; b=wC2YpjOWfcGS66Rll/uTMT3uOETlkDuFm16/OFyUtcY0MDw7OS2u+RUB0sISoC0nxnvhnG hSSE+/RDve0jxUVyUV6qXELX3Lvd1okZqXemPZnInltMtZVIqSS+9Aj38ZeiKODugFZk0z gaBb8mu7+FO/Uyb6zYeux8V1EnZ2DOBJiG1mFQIC9UyQXYPq/nvVsFUI8PUWWwFgpjpNZs CROz1jkvobaIBZGF4SqiGHjjEDp+EsQFtmF67X7OQL29iThMJMwYR7QOXEgITiLD4Kbu9J fusX+IedPUMAon7cKpgJC4kJHmh4u10zcTIYcl2znEFOeBsSXpsR4fa167I2iQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743443055; a=rsa-sha256; cv=none; b=wGMId8lwOxwi+IThbj903d6hIKygvy/0Dkrm5T81fbO9eHeM+8N9twBFCG4NaBoLLAzDyt +3bhBC+tqTGECBt1KPkNqZ9bNXsHId3//rOuuwdKy3bsCKgIfD8A0VsUbd+/LA7CwhfxzT SPkrnErXzoHBpjwBo02b9zOCaaj9KpGcdyaNezS/dhusHFK5MlFrzm0AFmwl7orJUSQmRa UKFf55Q5H+YBMChU1rGxyeXCU/kI0gNQ+UxKHzYAYUNT2D+nkr/3y0TUOBBRqsWuntMS21 jeD4bmPTnA0slDACs84q7gKjNkEkIWZKbMpZZB5KnrvSTA+hYkqiherVw49b6g== 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=1743443055; 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=WDyr9uKwKuuME6fAIXjOLrMNegmipEexMREA56GN4I0=; b=UWb+dhtx+OdRr3N+2p1/G54VSmiKfJRtP36Vlhm97jDEsYuJk24HER0uVOuO0e4Z25soBW JSId9dXH4NfSM3RssoLsM+D/xZkx9ZGxOqc5a7IEbeGA/0nR7OiiqIk3gL3V6oiPleZWMi EMjxXdMOf/tA/7whLDPR9IBboL8Q8vO8s2SoT4Wa7ASAUN+REPyTkEln9o89MX6owigJbs R1yHT5WmyFKyD2hKRE0LiSKUdRz/SpFThbZSQFKK9/C1jja00b7MbDD1KFsxOO0TlltLLY gSVEoFpPibk83/wvcSBnnv7BVHqN45hVZnt1l2Wm7D1aEwttSsrOWuHEKz5bUg== 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 4ZRJR31KVXzw1c; Mon, 31 Mar 2025 17:44:15 +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 52VHiFvV061484; Mon, 31 Mar 2025 17:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VHiF7D061481; Mon, 31 Mar 2025 17:44:15 GMT (envelope-from git) Date: Mon, 31 Mar 2025 17:44:15 GMT Message-Id: <202503311744.52VHiF7D061481@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: a5918bfbf9ac - stable/14 - linux: Fix a typo in linux_recvmsg_common 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: a5918bfbf9ac512ce2840541e9b66c2ffed44dc6 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a5918bfbf9ac512ce2840541e9b66c2ffed44dc6 commit a5918bfbf9ac512ce2840541e9b66c2ffed44dc6 Author: Alex S AuthorDate: 2025-03-10 18:12:36 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-31 17:42:56 +0000 linux: Fix a typo in linux_recvmsg_common We are supposed to check the result of bsd_to_linux_sockopt_level here rather than its input. (cherry picked from commit 9f55630b8d72602f6ec86b15b607f5fc5fde911e) --- sys/compat/linux/linux_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index d35ff37aee98..bed772d56684 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1856,7 +1856,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, lcm->cmsg_level = bsd_to_linux_sockopt_level(cm->cmsg_level); if (lcm->cmsg_type == -1 || - cm->cmsg_level == -1) { + lcm->cmsg_level == -1) { LINUX_RATELIMIT_MSG_OPT2( "unsupported recvmsg cmsg level %d type %d", cm->cmsg_level, cm->cmsg_type);