Date: Tue, 25 Aug 2020 00:49:58 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364743 - stable/12/sys/compat/linux Message-ID: <202008250049.07P0nwaa085558@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue Aug 25 00:49:57 2020 New Revision: 364743 URL: https://svnweb.freebsd.org/changeset/base/364743 Log: MFC r364346: Fix handling of ancillary data on non-AF_UNIX Linux sockets. Modified: stable/12/sys/compat/linux/linux_socket.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/compat/linux/linux_socket.c ============================================================================== --- stable/12/sys/compat/linux/linux_socket.c Mon Aug 24 23:50:23 2020 (r364742) +++ stable/12/sys/compat/linux/linux_socket.c Tue Aug 25 00:49:57 2020 (r364743) @@ -1063,7 +1063,7 @@ linux_sendmsg_common(struct thread *td, l_int s, struc * FreeBSD system call interface. */ if (sa_family != AF_UNIX) - continue; + goto next; if (cmsg->cmsg_type == SCM_CREDS) { len = sizeof(struct cmsgcred); @@ -1090,6 +1090,7 @@ linux_sendmsg_common(struct thread *td, l_int s, struc data = (char *)data + CMSG_SPACE(len); datalen += CMSG_SPACE(len); +next: if (clen <= LINUX_CMSG_ALIGN(linux_cmsg.cmsg_len)) break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008250049.07P0nwaa085558>