From nobody Mon Aug 07 14:24:22 2023 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 4RKJVG2nxxz4phww; Mon, 7 Aug 2023 14:24:22 +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 4RKJVG1wV9z4LVY; Mon, 7 Aug 2023 14:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418262; 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=bVNVKfrPxs3sIojZwrUWlIc9xdqKjLWd60iUoHBT20E=; b=f+lHlIXIw8d6MiYrKqdVWmi3C0iYbpLxG7V53w5RhP6y0vh2Pbq130Jf64j5fL6uNevOzW 3XgS9ERrJPK2BnKtSR9rx3/tWUdN3nMtX3AORRwX5Uq8a5Xq/9/CYsQGtb0C0xdP4/1zWh DRMREQ5GyjYWz50+rCvIg0+s5L08VwHoxKpZup/xNU8CvqXGCSCbtUS8Y3U6yZNP8w9MRh Hh84Eo/9xXoovdfy1G5zBMspuZ3rkRL4dgYKirtEg8w1vd/BtxOzurztNadX1OIbGkacTn 20m+cU9GHKPXDWMkBvUzxgh8D0gJC+r1ZVr8q29pW80ese/joFfospkZ2abFBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418262; 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=bVNVKfrPxs3sIojZwrUWlIc9xdqKjLWd60iUoHBT20E=; b=kuCjAvLOjbX0QiHHaQ+PTkhF2JOpIenxa73gpkZTXCq1sdccInvLtRGcuG/t4WOLcgsg1U gAksXXayL3de+8LTf+ReuXHcXIpUDUD+sstJJCABDSUb8FQJuqpsFu8nWAVwyX1C67fLCA vMIpO2ZWgbaxyXjS/VbyqsR3EAT+VVXUrneFIUXzBHuRmEJJj4Ih1zH7TBTJTR//scmxEY duN75ybuAhNEiCAWhDo4BN1VrZ+AnouyA9dvsP2tUXjWaP1E8JNtNMj98VTSxxRibOAeEZ rPocYcBsbkg0ZGvLRK44+Nfq1lIz7HiFw6W/a8xf9RjorxyODNJLDVq+FWoCDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418262; a=rsa-sha256; cv=none; b=mBHvjanCEcaKSmsB2GM1QPVeuV9Kpj5j+DArSUQhWVwUDk3HLAOYR2QISbC1GCCvJCxH/y XwTlkAjht7fHzDhEfa8IL4ZBz7zX/XL8W6T8LF45bX1Fiip2hPjvR4O2H6d4kQ5sw7I+14 nKWtQiLNIjmCSk0n8F8sgYGb8VOoBoDuPzvMkPtRpFJvb3E2A+u+C7JlbPPdoQZt5TVBR0 FsVjjvYPfLwHSb8fBgo4L+2TsPm3ALInWxmL16pUAQvVygfjOXeuxqp5YgslVYyJFz9uyz oocV9XmtrR9gIgC0NWs4/ZSvkotm7E4YrNWjCefR7cbX2tvNd+MDAzKDnXlrfg== 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 4RKJVG1101zvxn; Mon, 7 Aug 2023 14:24:22 +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 377EOMpE025958; Mon, 7 Aug 2023 14:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOMl2025957; Mon, 7 Aug 2023 14:24:22 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:22 GMT Message-Id: <202308071424.377EOMl2025957@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: 520891109c09 - stable/13 - linux(4): Fix control message size calculation 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: 520891109c096084774165015529e18de5a93cf1 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=520891109c096084774165015529e18de5a93cf1 commit 520891109c096084774165015529e18de5a93cf1 Author: Dmitry Chagin AuthorDate: 2023-07-29 08:21:35 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:59 +0000 linux(4): Fix control message size calculation To determine the size in bytes needed to hold a control message and its contents of length len, CMSG_SPACE should be used. Reviewed by: Differential Revision: https://reviews.freebsd.org/D41224 MFC after: 1 week (cherry picked from commit 67116c69052d27dbd6d6c066104850d4d53f0041) --- sys/compat/linux/linux_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 0bcba7167f2f..393faa5429ce 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_LEN(datalen) > maxlen) { + if (outlen + LINUX_CMSG_SPACE(datalen) > maxlen) { if (outlen == 0) { error = EMSGSIZE; goto err; @@ -1866,7 +1866,7 @@ cont: error = copyout(data, outbuf, datalen); if (error == 0) { outbuf += LINUX_CMSG_ALIGN(datalen); - outlen += LINUX_CMSG_LEN(datalen); + outlen += LINUX_CMSG_SPACE(datalen); } } err: