From nobody Mon Mar 10 18:13:13 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 4ZBQ4B2dd0z5pRL3; Mon, 10 Mar 2025 18:13:14 +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 4ZBQ4B17Ybz3nR1; Mon, 10 Mar 2025 18:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741630394; 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=icm6ZlOHMUTuedIwbsFdyO82ra6NOysbjuZa+jVS1BU=; b=HTXrkaNztLUqLqKr8voDo0u48UyOeqmmY25ao5s/J+5v8kfB9mji0ENbIaNV84Az4pBmfH YBmcme1DjIx/C15STeW8/2tadBewglBmi+jp8XRE4yuhwAZ2I64Jejvx3/1K4UhMRpeiwQ 3hHta3CMJO+fxvfm88qwr/yXUSJPCoP9X+28k0oPnN5C0BlKcvLCn5TAW0Z0SqryCGJFy5 qzHqM3qK+qHqMWfbkBnaCSaCs2OBuCJmyWfRo80a1k1WG6n1VUObij8ix56CmBnSfd3Bln 8qRNqS9dDbhEbaDqD44rTQrKyF5VIiPU/z1ZJnzDqVuKFBMVq/AuF1mhf0WQFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741630394; a=rsa-sha256; cv=none; b=v/TBW0MBxYDeL35YjXuVyO+SIRf+XPPS/sQrDSXFUazC84w3rleS4tktHAaYefFJYTfk/m FT0Jzg2aTE/uZ6aS8tMJIJEv6aZGE/j4n+qEDVaWDsjQPn2HREwVbSR+9q+hh//rHf8xc6 hLPNXGrXhfsH+wXmH7127JWGtA4XnUU1r7eiaNgx1BMG7Q6OLegB8tjuXcOwJIvhLW/V1l KOtLWKtv6TsGFpRO2S41CB1hgJIKGec118O7avMbhSOVzccOeYyaMdnBchBjIlGzf/KUL5 e7J3BaNKhJgIj5YdPJccgVppI4rBRu562wbs6jCMTNhbw890LOr7QDIbmIUOmA== 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=1741630394; 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=icm6ZlOHMUTuedIwbsFdyO82ra6NOysbjuZa+jVS1BU=; b=L/uRT8NJRwWJ/y9StCJf+i7Lh3cCuIvK+9hjCbDHIvdLCb8NzY4tgSWHEnF94eE2rWjUKw VnhKHJy0nrlFh9unj3Ld/QCKR3Bh3PCdjPLqolbapaZalbPO1elJ8Jyp5a0sX9OoyAScbe Rf2F1z1zLv3cGxMdRKf7Tdwoz6aA9EjK6Jwq50b8z9jbyHzxXAYiVNuwXGRXNNcjT/iwgt E0Z9JnZZA3xFLkVlyQqL+SBSSk77SyJY7hDvY/WpJ3ubBNj3XmthdlX3BoScX+Zt4coqPz NARV6xDYeuhKVqVk/YoUv5cJPegSzoxAGuEmPcuCZ41eRTqxcJz6swmITnR5TQ== 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 4ZBQ496xZ9zr9T; Mon, 10 Mar 2025 18:13:13 +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 52AIDDin001470; Mon, 10 Mar 2025 18:13:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52AIDDw0001467; Mon, 10 Mar 2025 18:13:13 GMT (envelope-from git) Date: Mon, 10 Mar 2025 18:13:13 GMT Message-Id: <202503101813.52AIDDw0001467@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: 9f55630b8d72 - main - linux: Fix a typo in linux_recvmsg_common 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: 9f55630b8d72602f6ec86b15b607f5fc5fde911e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=9f55630b8d72602f6ec86b15b607f5fc5fde911e commit 9f55630b8d72602f6ec86b15b607f5fc5fde911e Author: Alex S AuthorDate: 2025-03-10 18:12:36 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-10 18:12:36 +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. --- 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 6c6751ad30a8..a33b502f2201 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1858,7 +1858,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);