From nobody Mon Aug 14 12:47:21 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 4RPZ1570Xrz4qS64; Mon, 14 Aug 2023 12:47: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 4RPZ152rz1z3CYC; Mon, 14 Aug 2023 12:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017241; 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=sFeNlQPWQeSOBlYMBGvFPPDNiJrg6Q3VURITiRavmCg=; b=a+KZAOdTBGLHnEu0/PG84GaANxtPrYLam/cRB+lGSw5QmWUEzAPg2/VvfFeY5MswbElhju 15RbH+io7wz/wj17HSA+rbU/vDjTWEHPYvpiP+rz1joCb72CClV5cHuDqh61oLbnNIZUe+ gbNWZSfagmJSHVWqyCcrWxkqVw506anyyE5rsDX543U7cppE8V3rsxYwq3dEsqo0O2BRQY /xHo+DkffgQKcTK5iECn3q7vrQ1n9p/3q35JlUPfhF90bVY2/LVJ0Zb44igiPRWkxvIgRZ c/LbmpfkPBPjDaLWMWXtl93k16jsaIB7FCl4mAaSeGu6GgOoxDwRdaRIctUvTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017241; 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=sFeNlQPWQeSOBlYMBGvFPPDNiJrg6Q3VURITiRavmCg=; b=viNq+QWsm8aOVuhdW5aRO0tIia8iNSpFyZXokF7apFgLuMduTRuM2UFPlH0P9PObSPk/w4 Rpesh/MzQGPEoCljN58P7zHtCEh0ZRoT1PY/+8Uq2rSRpMzeeWVE3q0an5+wt3HXqMxyFT izR9hrQhndI0Ja7q/iG9JWSCMFB6NPcOYEgn4rXjgWQYWZ5l3fMBhe/aVh/szRbOe501qZ aM3vQw6wDI+YgnsK3HYFY4A9th3DrxQ8+AxYiQn8u4044IjOkUR3AGlRkFRFy4mlZ3vp5i 355DKzihM8JXpmDmwjm7/Vyorg8VYuqPYKBk4yyrF2PKU6Uht+ZTzrmTFMdkoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017241; a=rsa-sha256; cv=none; b=yMiflLF0jA1im3e64Jw0s3YrJaI03sWiQAXmi6l/pf3t5dDQJA+YnKCCv8k0nUH0If0kvw OpWHdTXZJERsjn3z3Uu3l8BpZ9RhggEkQefpYVMZn5drNQ7KH1o99KsFeHKc041Hp3piAo yd8h9Pb60IlaZBpQyeveiUUe21eyPb4rld1IlXsSFN7sRhCQMyhDliKL048ewTVBsxV2+v hn2v87uReK7rpqf42f8CXnTUaq/g3WG0xkYWMZfAassmcPz5oB55u+tv4xH0lyN+3Ws0hV UJb9G9B4NiF66sAPCmioQRyw9PaC6L2jpZHd6bKSwzPNqpTFpFj6QYUdYt5mFA== 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 4RPZ151XG1zTk0; Mon, 14 Aug 2023 12:47: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 37EClLjC044467; Mon, 14 Aug 2023 12:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClLOo044464; Mon, 14 Aug 2023 12:47:21 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:21 GMT Message-Id: <202308141247.37EClLOo044464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 2467ccddc0e0 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2467ccddc0e0f5c719eddaece69a7aa0589b6449 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2467ccddc0e0f5c719eddaece69a7aa0589b6449 commit 2467ccddc0e0f5c719eddaece69a7aa0589b6449 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:12 +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 --- 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 bd4b536e13d0..7acae92777f8 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1835,8 +1835,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; @@ -1844,7 +1844,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, @@ -1910,9 +1909,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: