From nobody Mon Mar 28 15:26:02 2022 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 DA4691A3196C; Mon, 28 Mar 2022 15:26:02 +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 4KRxNp3wWxz3QJF; Mon, 28 Mar 2022 15:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648481162; 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=nEo8L6dioWLbh7R7obmiuniYM7V11egcVUwDlaXd824=; b=IygYq3MQPUWj9hkaccKmWYFEtySYVftsCiLvERC6Wt4+YFabEhT4ZjvfRemYHF8bMKwfvb TYbCKjbtjWI5W6a0RC9g0pk7lTeOXDP8LS94UrhvWgmYjR79+9y0krNY4oMyXemzAxU4j2 oyUOyNsdFOKpnk8qDM9XzP+vimMCFDr4nnBlbV0TYpUnWncQU6gGn2ZewNmbPw0vU/q9xs p00cJCrZdL5EVXkcN9x3B1YSDroh0SbyYpHvDFYQhsUOvLxk4PDEQTKPjeYIq8ZhRAuTFw M9GHDlYpuZGbze1PKSlUi9SnT5zFDhPDtjsLcc0dV060jfAJrHss6VIeJs4i9A== 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 5E0D83BBA; Mon, 28 Mar 2022 15:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22SFQ2br086944; Mon, 28 Mar 2022 15:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SFQ21f086943; Mon, 28 Mar 2022 15:26:02 GMT (envelope-from git) Date: Mon, 28 Mar 2022 15:26:02 GMT Message-Id: <202203281526.22SFQ21f086943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 0cde69867849 - releng/13.1 - linux: fix linux_recvmsg() MSG_PEEK flag handling 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 0cde698678499d5a1f301c7d7509dad9fa52757a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648481162; 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=nEo8L6dioWLbh7R7obmiuniYM7V11egcVUwDlaXd824=; b=KvDVLO6JO6HoENaWHM2d9LLfmaS/TWloUTpnmECACRrgz1+TAcHTKqJ7ryzLtycmzWQdCl NlZo9ovTnkHI7Xx6X/qwlZflNH2AJishWd1hVKeIPIR+rBP+dUfKv6R41YUSIoHok0GF+Y 9dHfvO3/is82ykcn+ZJdJdJL+tMxZkYO6rDg/kLMpkaotbOobxajkt1ceXvbI11dEsW27c 2xQK0EUHbUbBlWB7sE3qU89IAmGsPAclV4toVuS+r5ka6jeltFP2X/Lu5jCH1K/HNv+QYl RYpLoopm5OXFg0ZtDITLuCfyhXVX1bJDi65l3+PMr+d7BpYbvBxZQjjQf5XW1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648481162; a=rsa-sha256; cv=none; b=OkNQnrNk+NBf9vVJil/QwkJUsd6P9PMP1RMkAOeg9ZWgFQJBGHFk5+PBRC3TI6PVFfQfRX iVsB31QFbC8AWQqg9URwb6cWHFR094HzrEEFdJLgosH1Guj2yocdlzaL9LrACfzaE7BB8f gQbgd3Qf5j9WZzE6FTJgVCyDfaLMyOH1ZkFcdbhoOsOqEovZ56C3LLxAj3f3qrtOOSYxWY W2wdbTiyj0yv0x7tOcoyF4VUK3iXiK0rukSYD/eZ3U4tPSyGqvNdD9AlENF2d3sjo67KYG WIiT3ukOEhNTozEBTC58AF6JMWwCEjlurjnfD5ElGfIUxtNZnovHXETMo9NHvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=0cde698678499d5a1f301c7d7509dad9fa52757a commit 0cde698678499d5a1f301c7d7509dad9fa52757a Author: Alexander V. Chernikov AuthorDate: 2022-01-08 13:44:17 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-03-28 15:25:16 +0000 linux: fix linux_recvmsg() MSG_PEEK flag handling Reviewed by: kib Approved by: re(gjb) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D33790 (cherry picked from commit 96c524d8b2c9abe3927abf948fbbd73a7cb42c4a) (cherry picked from commit 0b6161db7eff92a37bc6d410ff9c9d5c3ac6f443) --- sys/compat/linux/linux_socket.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index a2b45edf7bdc..d51b9945b434 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1538,6 +1538,12 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, if (error != 0) return (error); + /* + * Pass user-supplied recvmsg() flags in msg_flags field, + * following sys_recvmsg() convention. + */ + linux_msghdr.msg_flags = flags; + error = linux_to_bsd_msghdr(msg, &linux_msghdr); if (error != 0) return (error);