From nobody Mon Mar 28 09:16:05 2022 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 DF3851A4129C; Mon, 28 Mar 2022 09:16:05 +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 4KRn9x2fTpz4sBb; Mon, 28 Mar 2022 09:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648458965; 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=9xJKGDjEGzxq6FN8DJmDzjXDOkI8EBHlJQ8hxs/81/w=; b=edbwt6isCMUcbLSUR+mDReQ2GOBVt5+TFv8drVp35cbCkaBKzAgQ1BuCizX2k7zgJyUTLp zx1fZP6Vdhrj7c7rDA8lbP9fSXCIhVvkyrwIvTMQ64GjixAy3VQIMmVehXM9X6k/rZxZWg QKhn1MW3oLl9rhWiO3j/2mgeY6Lk/9Q5K0X6JoaxnMTFZkUz9Uh9OVQI4BjRfzx9SYZgZy mh297ztZC0O1bh0yFKyBuXbR7V39r83qNHbM58uNjh3EACshL+IbWo9hQ+MZ5Q1OWlnxrU DM4HghqHtUkQLUG5YbAH4+uGZCFXzAiuxLvtPi3XLh5TxY0HJiJWba/pwqlbqw== 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 23D1627089; Mon, 28 Mar 2022 09:16:05 +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 22S9G5ua087760; Mon, 28 Mar 2022 09:16:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22S9G5ZC087759; Mon, 28 Mar 2022 09:16:05 GMT (envelope-from git) Date: Mon, 28 Mar 2022 09:16:05 GMT Message-Id: <202203280916.22S9G5ZC087759@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: 0b6161db7eff - stable/13 - linux: fix linux_recvmsg() MSG_PEEK flag handling 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0b6161db7eff92a37bc6d410ff9c9d5c3ac6f443 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648458965; 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=9xJKGDjEGzxq6FN8DJmDzjXDOkI8EBHlJQ8hxs/81/w=; b=WmaYkeK5CT5lgrjwsd/E0Af++1uY9NZKLaldubOhiSxDpAm4Dy1dkPDL+Y+y0uXdlI2Xey S+5hBw2aH+5QD/XjEy4UvNUQ9AMQdqSWw6RH4Y4rPrnQhTIOT4YKcZhtfTjQXRNa+nM2Ts 0jsgBrMV6HIvwWnJK7Z8PyLBZ0bLfNhUbvTqs/n49x76dmfc2+ZsDBWmXkni1PBzUjbGYy 0+gx2PYXbZJtnD8UwVmbiGZeO4Ou9oO6tgVMeK1eZrCiC8E2VQ8tqeP/KRu2sglcGgRQFc 3FAhs/7sk0i7UBeW50nUh50NRBZDW6tmJXDOIDo04gDncPalJVGcT2I/tTBwlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648458965; a=rsa-sha256; cv=none; b=VclLfN6CW7guhVGNf7kDPq2wIVfPysQFDzeDiQd530Yd9DMN6+VXvYTNoM3MqFS+ty1pIJ HbNvrnCaQ1Z+R4cjk3yFh5l1PHxRx9nxDESYHgyENmdjxzR5IszBCCqRiRSNkEVIlLGg8i gGGIdBRZU7Wn1ZVtwco15k6sHjoI+zpZAoZrbFO6YqfS0XYH4MPvbelmtNuxarqsZcJ17l TAR2yy9VUe5PblMchESK9+WIL7LnglQpQse21XeFabRoUodxyRJn2Q98EDdPh/AjYmaz2k cf9y+D2aBOzHe88ZuKLUhwlyAVcO5KenBNJcJUxXGH6kxiB/wV0b5WPebx4dDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=0b6161db7eff92a37bc6d410ff9c9d5c3ac6f443 commit 0b6161db7eff92a37bc6d410ff9c9d5c3ac6f443 Author: Alexander V. Chernikov AuthorDate: 2022-01-08 13:44:17 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-03-28 08:49:13 +0000 linux: fix linux_recvmsg() MSG_PEEK flag handling Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D33790 (cherry picked from commit 96c524d8b2c9abe3927abf948fbbd73a7cb42c4a) --- 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);