From nobody Tue Jan 9 23:00:22 2024 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 4T8mc66mDrz56jKb; Tue, 9 Jan 2024 23:00: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 4T8mc66CtWz4LWt; Tue, 9 Jan 2024 23:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704841222; 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=YrxaW6p+ytZitJE80S723t681LJGXL0nmf24Pj6EiDc=; b=h2wSMuUYPUqTEtB9YC1xWXJiU8rwa/wZRjQrNC/zMEAjf++nHKIyKrPI3GFfd3LkZyGBs3 RfQZizl/RcfVekDF7ybBT2fC4GVUdhZvbp9YH2MMcP02ll48zEYqXKcdO+j4hdIUmhRfAR DVQlg44fc6rgqHKdEcv7dUw9J0cxasG3CUuFCuwX1iHC4KTtHQE5NAinAqjDvb1KaAEguQ ZsdYF7EIdgoP/r/eAETZkXR4KlPYgFYMpZTeYefjrBZ7ulQplHj/Br2S3DguGnVkgxHCgz R7P2mNPILmwstd9ipfQOPZkf6HhK2kuCqLbarmgJ9oCmkDGD09V8hmTcW5HuUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704841222; 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=YrxaW6p+ytZitJE80S723t681LJGXL0nmf24Pj6EiDc=; b=HQ6EaRVGdOQM7Tpd8Tgy4PkAXDjFGnu+T5pLKG4AJzFt+J5nzEXJ/4F8HP1ClDymvytj8J QUNxOLrLtxNpbcseYEX50dfyR2rMsGWDbmGbu7Vh+eYl4StKlzAI0TXEOmc6nvlt3uesxK Z6JVVdKi3aB6hpPsiZ/kTJMIIP5wTCS58S3ewlRraOrfdMVb9yibrjx2kRL3ysdOMb/oeg M3b7d3+Ep3GwFRrLEGdfru+Q4lx2mHQpHckOQyv1VjZQFzsCKIOTw5UuHNwl3wHsShqaSP EC2xXOWU4kcx4QFtTN8QepI7Evb6jSAH7SPQ1Wy3zh92w5eDFiPbyM02CMxUZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704841222; a=rsa-sha256; cv=none; b=BkXfSOWzAckimxZsWvJzeIgy21VWU7jSNCO13w3tWQhYX+vqm+okPORULyrEZ1jTUwWMFW qdNe88WT9b+RKt0A3MrHbQEcUg4bPxK9WgQlE7AgErRanHe7Ez8oWlO9knj/4/uOhYlhND iuHHju4R+XfZRvvjcm7hN4BKQ7YdQr1EsrklvQ/EJRYcjeCdswxVg6mJBAF229NLDCDCHa jngCdpP94VWue+PD6gN7gqefDsZL20PqpbP+jSfJhvm6EGZ8Q+Mv6ggGkzTFNsoVKeXxFR LyyPVHoBb+wMS/1LYCKl9wykVDLhy/KL3sE2SidF8Lwh2xzf7Ucfuc/GQH42Bw== 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 4T8mc65GCFz18pP; Tue, 9 Jan 2024 23:00: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 409N0MnA095359; Tue, 9 Jan 2024 23:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 409N0MdC095356; Tue, 9 Jan 2024 23:00:22 GMT (envelope-from git) Date: Tue, 9 Jan 2024 23:00:22 GMT Message-Id: <202401092300.409N0MdC095356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8e2c2992da7a - main - socket_msg_trunc: allocate a large enough buffer 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e2c2992da7aab7213b6349ff54dbaf1dcc05678 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8e2c2992da7aab7213b6349ff54dbaf1dcc05678 commit 8e2c2992da7aab7213b6349ff54dbaf1dcc05678 Author: Brooks Davis AuthorDate: 2024-01-09 19:35:37 +0000 Commit: Brooks Davis CommitDate: 2024-01-09 22:59:29 +0000 socket_msg_trunc: allocate a large enough buffer Allocate 9000 bytes to match the largest requsted size. Add a check to prevent the list of sizes and buffer size from getting out of sync again. Reviewed by: markj Found with: CheriBSD Differential Revision: https://reviews.freebsd.org/D43340 --- tests/sys/kern/socket_msg_trunc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/sys/kern/socket_msg_trunc.c b/tests/sys/kern/socket_msg_trunc.c index ff0499c4540d..b0ea724f0de0 100644 --- a/tests/sys/kern/socket_msg_trunc.c +++ b/tests/sys/kern/socket_msg_trunc.c @@ -44,7 +44,7 @@ static void check_recvmsg(int cs, int ss, struct sockaddr *sa, const size_t sizes[], size_t nsizes) { - char buf[4096]; + char buf[9000]; memset(buf, 0xFF, sizeof(buf)); for (size_t i = 0; i < nsizes; i++) { @@ -52,6 +52,8 @@ check_recvmsg(int cs, int ss, struct sockaddr *sa, const size_t sizes[], size_t sz = sizes[i]; char tbuf[1]; + ATF_REQUIRE(sz <= sizeof(buf)); + rc = sendto(cs, buf, sz, 0, sa, sa->sa_len); ATF_REQUIRE_MSG(rc != -1, "sendto failed: %s", strerror(errno)); ATF_REQUIRE((size_t)rc == sz);