From nobody Mon Aug 21 11:41:14 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 4RTrCZ3jSjz4qflF; Mon, 21 Aug 2023 11:41:14 +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 4RTrCZ2vN2z4V83; Mon, 21 Aug 2023 11:41:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618074; 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=h0Oq2uKNi7kPEBXMfI0V9NKutKWoAnlhbQGMG3elvsY=; b=C95Cc//wSA2uDkZ+S+WWNHJ0bDdBaCRaA32I4reDh5y63N/XA288XrTV/ZuDDesv4+v0ef tsY2XswkyIECRwyny2HdeBUplBT4VJab22VBhLkinB+c0Rr/Rqdyxf9wa4NTB6ohwOFXRR dHqpQYRFzVJurACyiRG6jBRrIwOSew9fOtyWQDK+nn15xtaf5UoWAm272rE8uki4VqJPzn pSrr01i0+D3DHTAKSPZCC/Q15xHv5KBJGov3PdOynO5RQHgs+mix+GVZYFx5gSMGnzlywd 2G1OAxYx8cWiIpOkzPmSu8ZL0w3HE0vi3/+ba1ndapzZVwdlLqcx72k7Qh16Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692618074; 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=h0Oq2uKNi7kPEBXMfI0V9NKutKWoAnlhbQGMG3elvsY=; b=feL9tZvER5CVpHZclk3eYJZiwFve0Bd7BeVn5cXevunsoN9DwYDusWxjTnIh2wLYc1U0FK +YrM4yMiH5Kzt2CRvzO+Y/RuYLjQAnXPfu0kKgkXR54Kzia9Sgqa2AKF//mtioanLy4+VK q67895rP/64IMhlr4nf+F9nM9eQ/+vP1D20Wq3LBr6RNc661ZgiVeVmbm7UxsdsO5OJx8F xB9k1TKqDfrLgXJh+RorS2UeGy1s0MmCmoKzV+dzKKqVLWS4876jjkj8vS83AuBkIO+3n7 X/wGxOY4LjOQ9LYG4dR8zpZ09GY4qv+z7VzRyQYK6t+vN9uBRAas9v9G1Wapdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692618074; a=rsa-sha256; cv=none; b=xHk42hyR0kH4E+xDu00IRxYzmO8hV2Sp6EnQr78H2d4ig7qhweMcVGf5ihzdGq/3KdO35M PQHkHV9EzQH7OrzS43Oq2u+PTau0e79GtgO4/1Jx+SwBIARCGyq+xm6EHhwKxKJa2l3K4k mLI5YkM0P3a8e/TFk4n3k4VhEPEQH6Ssq9iUNVzqJShR6zeIokP0O7KSeY/sWVK+BOtQFb lxbgKxYZLmgBqtVJ83nKnJtSKPSYu7K5HS6RW2n2u0wM7YVsSjWDJ22jKyVjwzl+azy3rR ux0SUteQNuQc6JfDygZZjZ4Wq5/c5ecLRQ0RD0qz3+Wq64nJCEVrp8TkfWZD9g== 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 4RTrCZ1xjqz4c1; Mon, 21 Aug 2023 11:41:14 +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 37LBfErp045446; Mon, 21 Aug 2023 11:41:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37LBfEg3045443; Mon, 21 Aug 2023 11:41:14 GMT (envelope-from git) Date: Mon, 21 Aug 2023 11:41:14 GMT Message-Id: <202308211141.37LBfEg3045443@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: 1cb6dc1627c4 - stable/13 - linux(4): Fix control message size calculation again 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: 1cb6dc1627c46a0d4b461a4c76f9ac681a5dff27 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1cb6dc1627c46a0d4b461a4c76f9ac681a5dff27 commit 1cb6dc1627c46a0d4b461a4c76f9ac681a5dff27 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:11 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-21 10:39:04 +0000 linux(4): Fix control message size calculation again It looks Linux recvmsg allows msg_controllen size less then CMSG_SPACE buffer, at least for case with one cmsghdr. Glibc misc/tst-scm_rights test succed on Ubuntu 23.04 Fixes: 67116c69 "linux(4): Fix control message size calculation" MFC after: 1 week (cherry picked from commit 7d561928e65af6fe90ff9e316b2d50668c53b464) --- sys/compat/linux/linux_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 393faa5429ce..b30ec4e270f4 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1847,7 +1847,7 @@ cont: if (error != 0) goto bad; - if (outlen + LINUX_CMSG_SPACE(datalen) > maxlen) { + if (outlen + LINUX_CMSG_LEN(datalen) > maxlen) { if (outlen == 0) { error = EMSGSIZE; goto err;