From nobody Fri Jun 17 19:41:22 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 8F7B385DB98; Fri, 17 Jun 2022 19:41:23 +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 4LPqD31rHqz3jLr; Fri, 17 Jun 2022 19:41:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494883; 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=x8a0gY98e0JlF85w/zWHtXbx/ibQMOtzNM/NFFbm0FQ=; b=d+Q7zKiWc1pGL/8KlbHw+CjKJPpDLg0DwfB4jBX+JaKp3u2qSYQnEH1oa2JFqrwWv9v8bP VedVOF4BmSIsFPR32gYDRsVKltV/zo/BSRdjRcWfPZdTWzRba9ZiGHagV31rKPzwLOhgiG Y/NqS9Ny0LcinnZDV1mBpsHVzWQ2q50pMCgeH9Y1AAo0S32R+6dcCOiFUexdkP7y97T/TL R3IczH2+c8OvrNyzRevFmjWFVoCjAl9C4+XobBVPSpkXT/iCpEJ8xp3VU+6Ld2tPryuEvU rFp7k6TQkFDcAZ1SJC4xBmylpokU2O1ghxu7VTpa4z4YK2hIhou77vPtbpcp5g== 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 92D7A257FE; Fri, 17 Jun 2022 19:41:22 +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 25HJfMIU030389; Fri, 17 Jun 2022 19:41:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJfMHV030388; Fri, 17 Jun 2022 19:41:22 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:22 GMT Message-Id: <202206171941.25HJfMHV030388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 82062a044383 - stable/13 - linux(4): Handle multiple mbufs in a control message chain in recvmsg 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82062a044383ecb402a1f003249359616a660390 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494883; 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=x8a0gY98e0JlF85w/zWHtXbx/ibQMOtzNM/NFFbm0FQ=; b=PF8H2OpefzFvu+l1R+2161Uz7BGSfbd3Yl6mTd1yfdmLbwXUX7nsXDiLU4UyoVhO3ztUI1 5mrZwwCJ6fTQE+wHciYQUWyG6tCTwWKKMMmvsikQP+fXs1Jr/lTOzVAQnN4L/ZAESXhekS h6Dlgt519iyLtdlv+dQy3sRNjVhj/Kg+hd6aVwPEwkCcbcZyM3VwhBRYHP6o7uGkcaRXEz kM0KNsLyS603csZaogU04WmW71z1C5zSc/m9oa4LDCfte6d3NJasqFJuTT0CAe2m29buk+ cBY0NqroUDx42LNH/gwtm/Uw8qsJUIEyuAu4vW/c4KOfvw6YCWVArDSSjTGEYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494883; a=rsa-sha256; cv=none; b=ai1cskQaOqrdsbWHerLeEFGeAAUUMMJ8VXbMdEeFttbYb2fNRzN2Uysn9MMuRzzfJKElYu s+9SatDk6JBdYhoKC3dUTLVqzWF40ufyewPtFUNriR8iTOjQWl8Eu700zAe4uKl6WNICyB Hi9vJIGPUQL72LHXo0t+/OkJtK/4SeAlpcMlouZVjfHXAK8VMDxmqTklwB6UTCFVK2r3aN hbgE89UcWrmze/NGrUsy88MpgwJ2DCkO+0HlEe9Mn+gs/Fsdqv3VXhU1GrSm75wcuOrvJE zH75cIkx2GzU4exEqA52qTUA+aQ45iID7NgdS2sC+oAxAuiGLSMAub8ujoLfgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=82062a044383ecb402a1f003249359616a660390 commit 82062a044383ecb402a1f003249359616a660390 Author: Dmitry Chagin AuthorDate: 2022-05-28 20:48:45 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:37 +0000 linux(4): Handle multiple mbufs in a control message chain in recvmsg PR: 230274 MFC after: 2 weeks (cherry picked from commit 3735f9cff1e8a7ce7079b957bc3b37f0f886caed) --- sys/compat/linux/linux_socket.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 67da1b51a86e..9434e40709bb 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1727,7 +1727,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, socklen_t datalen, maxlen, outlen; struct l_msghdr l_msghdr; struct iovec *iov, *uiov; - struct mbuf *control = NULL; + struct mbuf *m, *control = NULL; struct mbuf **controlp; struct sockaddr *sa; caddr_t outbuf; @@ -1797,10 +1797,10 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, lcm = malloc(L_CMSG_HDRSZ, M_LINUX, M_WAITOK | M_ZERO); msg->msg_control = mtod(control, struct cmsghdr *); msg->msg_controllen = control->m_len; - cm = CMSG_FIRSTHDR(msg); outbuf = PTRIN(l_msghdr.msg_control); outlen = 0; - while (cm != NULL) { + for (m = control; m != NULL; m = m->m_next) { + cm = mtod(m, struct cmsghdr *); lcm->cmsg_type = bsd_to_linux_cmsg_type(p, cm->cmsg_type, cm->cmsg_level); lcm->cmsg_level = bsd_to_linux_sockopt_level(cm->cmsg_level); @@ -1876,7 +1876,6 @@ cont: if (error == 0) { outbuf += LINUX_CMSG_ALIGN(datalen); outlen += LINUX_CMSG_LEN(datalen); - cm = CMSG_NXTHDR(msg, cm); } } err: