From nobody Fri Jun 13 01:21:43 2025 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 4bJM7C450mz5ykGt; Fri, 13 Jun 2025 01:21:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJM7C2fWWz3L4R; Fri, 13 Jun 2025 01:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777703; 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=lznZaORE+Qn0g4ivqoElNVYpub/nzZhwK3mPVQJKxNc=; b=fBv/DpBRKywyZuK2HljhRAEXU1ljI8wWP2uOBU02pBpzvGCZazeNlhxQc9ToKCVJFrkHdc 1rByHZMJe1jkcwHTGr5bvF965oLYQ21DIEDJZNLc+xmwRYxVfWGwDFFO2V5LWM4a94xmiQ Go5GOkvgkrVjjMhuFdrlIchwhYMjRVwl7blunQOtQeeWD+jZp9D9wTaaoYfoWuk8O21xvq Vgmq07y82lYYAX93dmXykLZZYJkbEVLH29cFJrPvtsfu+qqJnqBnO1nV+J+ChHjKRQBTbu HggT0gk+TE+cxHfjdgKMBcU1FUlTRfLB6fqdX9h3AaeZ7sP4e3prs6ToZofvFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777703; 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=lznZaORE+Qn0g4ivqoElNVYpub/nzZhwK3mPVQJKxNc=; b=gugE2eQKGO27yVsOUs00IjEPm8uVwEk3Be6l1baCWiuogcu5ON2y8qLFV2Q2NYBnMFWr1+ rFsw5lTBhAHbmm40xrbwrOYDmZ8Mwftc2EG5V+nchTLCgGFk8tdd4STp/3JG0pSGGMKFhy svc+2OYkZD3tobSRjZs8UPQvXQMsh/Ip3Gqecqi3a9geBLCS8yd40mdIG+zCBiMoUllWYL QrcpMMP0TW5ZdC6D7nOnfiN8+Zsw8vbR2nN1woSlMMGhbASP5PEZ2N0UMnEBTR5WlkFdqc Hn0IhWBdN77DAvXjsKqkV19kGrITK83DNuQaiaLS1lfxIbjnrPwLLeHIkc5TtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749777703; a=rsa-sha256; cv=none; b=TULpsAvnhuWAAIl23FatD8cZa731fDTeCx03DiE2B/rdKwXhrHCHN1hCMcunOVs/pdWtmI w+Hl7DPk69rTxE6RNQU6ack9iBHvECtizbw4C7P8jjZAOQG30YNJKRDRduBDD26jC6ylIX md973gHz1loJtg5iHaci+aB7Jnbv8JL4dsVEMBiK6imTlziTS4X0jDMJgDSbzifzqeD2eM VdB7lqbpwtKThhYy2OGjMzfhfeSDXILvxGfTmc/SX6GW7E0iIrRoLFKCyWmooJZQ3kwR8U rJ6nNgBQnk+KVQpL9sEgoXXDg6DqmMz2HHswlIIEGrs88TBP6bVlGD4t8UM7YQ== 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 4bJM7C2CZ5zdJK; Fri, 13 Jun 2025 01:21:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55D1Lhgh086462; Fri, 13 Jun 2025 01:21:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55D1LhXF086456; Fri, 13 Jun 2025 01:21:43 GMT (envelope-from git) Date: Fri, 13 Jun 2025 01:21:43 GMT Message-Id: <202506130121.55D1LhXF086456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: aae67a2c2b66 - main - mfiutil: Fix unsafe assumptions of snprintf(3) return value 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aae67a2c2b663a6bce8fbc087ff8490336b8618f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=aae67a2c2b663a6bce8fbc087ff8490336b8618f commit aae67a2c2b663a6bce8fbc087ff8490336b8618f Author: WHR AuthorDate: 2024-09-03 10:19:04 +0000 Commit: Warner Losh CommitDate: 2025-06-13 01:21:44 +0000 mfiutil: Fix unsafe assumptions of snprintf(3) return value PR: 281160 Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1405 Closes: https://github.com/freebsd/freebsd-src/pull/1405 --- usr.sbin/mfiutil/mfi_bbu.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mfiutil/mfi_bbu.c b/usr.sbin/mfiutil/mfi_bbu.c index 9075c4d0ddd0..e97227d47c70 100644 --- a/usr.sbin/mfiutil/mfi_bbu.c +++ b/usr.sbin/mfiutil/mfi_bbu.c @@ -50,10 +50,23 @@ mfi_autolearn_period(uint32_t period, char *buf, size_t sz) tmp = buf; if (d != 0) { - tmp += snprintf(buf, sz, "%u day%s", d, d == 1 ? "" : "s"); + int fmt_len; + fmt_len = snprintf(buf, sz, "%u day%s", d, d == 1 ? "" : "s"); + if (fmt_len < 0) { + *buf = 0; + return; + } + if ((size_t)fmt_len >= sz) { + return; + } + tmp += fmt_len; sz -= tmp - buf; if (h != 0) { - tmp += snprintf(tmp, sz, ", "); + fmt_len = snprintf(tmp, sz, ", "); + if (fmt_len < 0 || (size_t)fmt_len >= sz) { + return; + } + tmp += fmt_len; sz -= 2; } }