From nobody Mon Jan 17 09:35:20 2022 X-Original-To: dev-commits-src-main@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 0CB6C195C4FB; Mon, 17 Jan 2022 09:35:21 +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 4JcmwS6wbWz3Kcl; Mon, 17 Jan 2022 09:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642412121; 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=l0lQaaTWaV4r6AeR1KMKoViwkfsUbc7yUgcXg1V3UCI=; b=Mrh3U+jV4qOIZBk3feE47f5ljW7nHWVImTuAfiDs4XSgjmshdo5JD2a2NxQAF/6Efu7AqN 89Dh9NYi2J+jYpwzQVpFCIOZMIf1tAPVJYuK5WStyhRff2Y4i+6s0Z0/xJvgUULtowjnuI jzlfb+u1EM0nK62wQi/CNW6NjCFgziBlsA1C9M/0Dh6PXQtKa6TNK+vVtM3/iZU7eheYhM GwNFGat1jFKhoO7OG+CPntQtN1KbfTb28g5mvo5Us5E3n1AeukA649QRGjvso54hMxvdDn +rRXfZHVlgmQzshnhM9mGsxvBK/sii/5M0t9Ni+wt3TEcX2rmJADCk5N49Zaqw== 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 CA0C03369; Mon, 17 Jan 2022 09:35:20 +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 20H9ZKBp069497; Mon, 17 Jan 2022 09:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20H9ZKEA069496; Mon, 17 Jan 2022 09:35:20 GMT (envelope-from git) Date: Mon, 17 Jan 2022 09:35:20 GMT Message-Id: <202201170935.20H9ZKEA069496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 96c524d8b2c9 - main - linux: fix linux_recvmsg() MSG_PEEK flag handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 96c524d8b2c9abe3927abf948fbbd73a7cb42c4a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642412121; 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=l0lQaaTWaV4r6AeR1KMKoViwkfsUbc7yUgcXg1V3UCI=; b=LK8fHWmC9BG9oOdJlrBDowaSsiMEoe4VWNoU9UINErA7wrrW8D/UlObnNkssgAzP6prBc3 0AogSzl2WhMfzrZQRIz/yjybH39EMGoTgsqiWGHkaBfj4urcayOBSExTh1WUq3AMUS9hg1 VpGjdi+kRXphkWnOE6g5EyLeswVCXh5OlL3tOPz9PEqovlFtwWhkaZ9xcVMyELDhEs4uLF NNLgGAQwCoxvjX9jbKKFbLBqVl0SBqs58kwzQXgRwCUfa22c4hUs9lqQlBNoTY5EKH1Ynp hZNsYVW1YxcH4u2g751SNG4tQKZPGOQO6lQGyZUTuT1e5SiAUENooLBPPRPRhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642412121; a=rsa-sha256; cv=none; b=UparEz0zsJd+9RNK1iTyB73/sY+LRHGE7qn00c3GolYydaRISkdTGhGFDTkQwmfxkMNTgj TtXHBKsrwUaEgtG/27ohAFCR/BPXccMKeHqliQSQniizJjVkgqrSCRnTqBxBiq2yvc9khy gUzS7WLuJ/bkTjfIrPZGN/CDfLGlSp4GXf0Re8em+qTtnQFfkPfjdhcnMohz+Cwzew8pcQ ivCrcyXn7wSSj9QYmkyhJU7IR68bEsF4qUVKvI6+uDVl6UQKjaL8Kn7y6hTWYAz7/WRci9 UbtsZ6S8YlNcDo0pWfgUrIoNZAKechURmujxEXpasq4hBDtPiRFKyQC5nl2fhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=96c524d8b2c9abe3927abf948fbbd73a7cb42c4a commit 96c524d8b2c9abe3927abf948fbbd73a7cb42c4a Author: Alexander V. Chernikov AuthorDate: 2022-01-08 13:44:17 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-01-17 09:35:15 +0000 linux: fix linux_recvmsg() MSG_PEEK flag handling Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D33790 --- 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);