From nobody Mon Aug 21 11:41:20 2023 X-Original-To: dev-commits-src-all@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 4RTrCj1rZWz4qfqc; Mon, 21 Aug 2023 11:41: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 4RTrCj1FPnz4W0c; Mon, 21 Aug 2023 11:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618081; 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=HXqH9HdnTOuixqJMqBuh4tnX5F5xxhi6KoePEgBk/dw=; b=NkFxR9zn+belUtAx9xEBZ8aXQeHxrpR6B5npoT+8yBVqVlVKEyD53ZjauIVBI7VAprZY8X qkZmil7d5Awcs8xPoNPvZlQaFRHkSy0BTVALDDFx9ftoDCmE2md5bHQQlJtiYJ95FOq/So 2wMApf4Yoh+LARFHrdstwTI1CUby1wn96IijTUotrLJnPTqrG5/NrZM7MI+uYaqrzuq+yk outILA7Wo4scJymbrTVXO1U5xw4UPaboCOXNl5sIdkP9LFNpbCJIT1+RbWmYAxdO3yn41h MNbfzuWZzexXZaWCUsbzBJAZkKw7/FuCY/pIjCohQT6L6tQTJ65mPhvSoWkdyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618081; 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=HXqH9HdnTOuixqJMqBuh4tnX5F5xxhi6KoePEgBk/dw=; b=sOHHPL/O75GsgzAVk6LakumQP5pSxp4DC7VQMAMD0m7yfhg/ZTUEcXuGyPgUX9JMxtzRb7 T+REov9ULKEkDkcuugJkZln7e1qT1EWASVnK24FwqDkzC+DTafszkBPPsKREXv4+vrCSrj hM57/iYNsndFkBHiMHlKXkzqaGufiFCd1rS1TUhAzITkfOCyXLqMZS/HVsWCi0ClB7x+kK qGHsRZxU8sEvsWokZ5ypQg11dHNp30qF8QeceqRfkindYbGdsl0MwSTuvxPf5vCN38fk4X 38c+JBr/Ahe1AXYh3v75S904t/VsFRBfHe5a4TFGMufLu00C2ZoHxRkoIjexxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618081; a=rsa-sha256; cv=none; b=yasZEY5sl7IWxGwyomHVcSqXjmSfG3Qk2IK7QnAmkfx/0atnYfq2Vx7216ocBElui6fAx2 BaCJMEXzYutW/zWdqJEvz4lyzkknnX391fJG6rb4vYPEQgNg8F/9LBGf4IwIKDF6bwB7R6 Sr6W5yVEK0SALaB1i8wKg3gCmuIuOkQRdMHNSGOGpEKs3HWfiPs1cuxusH5zoUpT22dBrM 93ldXHi3ewrYiDaL7bJVamTR2MH8vaGLN6pQIOZJ1WevZjHuyuCWtKHelM8Mdf9RrkrtKB pwQja2o3MWk2XaGa4BiaOSVCQ8pCE3iIWaGVkIGpibDjijgOv29t9aT2AL3xvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RTrCj0JFHz4c6; Mon, 21 Aug 2023 11:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37LBfKMB045916; Mon, 21 Aug 2023 11:41:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfKdo045913; Mon, 21 Aug 2023 11:41:20 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:20 GMT Message-Id: <202308211141.37LBfKdo045913@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: 74614fa93a62 - stable/13 - linux(4): Fix MSG_CTRUNC handling in recvmsg() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 74614fa93a62385b899b34e9f44a098a6ddc3cb4 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=74614fa93a62385b899b34e9f44a098a6ddc3cb4 commit 74614fa93a62385b899b34e9f44a098a6ddc3cb4 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:05 +0000 linux(4): Fix MSG_CTRUNC handling in recvmsg() The MSG_CTRUNC flag of the msg_flags member of the message header is set uppon successful completition if the control data was truncated. Upon return from a successful call msg_controllen should contain the length of the control message sequence. Fixes: 0eda2cea MFC after: 1 week (cherry picked from commit 2467ccddc0e0f5c719eddaece69a7aa0589b6449) --- sys/compat/linux/linux_socket.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index ba17e38c1c64..421247570701 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1830,8 +1830,8 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, if (error != 0) goto bad; + skiped = outlen = 0; maxlen = l_msghdr.msg_controllen; - l_msghdr.msg_controllen = 0; if (control == NULL) goto out; @@ -1839,7 +1839,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, msg->msg_control = mtod(control, struct cmsghdr *); msg->msg_controllen = control->m_len; outbuf = PTRIN(l_msghdr.msg_control); - skiped = outlen = 0; 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, @@ -1905,9 +1904,9 @@ err: error = EINVAL; goto bad; } - l_msghdr.msg_controllen = outlen; out: + l_msghdr.msg_controllen = outlen; error = copyout(&l_msghdr, msghdr, sizeof(l_msghdr)); bad: