Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Mar 2022 15:26:02 GMT
From:      "Alexander V. Chernikov" <melifaro@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 0cde69867849 - releng/13.1 - linux: fix linux_recvmsg() MSG_PEEK flag handling
Message-ID:  <202203281526.22SFQ21f086943@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <melifaro@FreeBSD.org>
AuthorDate: 2022-01-08 13:44:17 +0000
Commit:     Alexander V. Chernikov <melifaro@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203281526.22SFQ21f086943>