From nobody Wed Feb 11 06:15:34 2026 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 4f9p864Q9cz6S15b for ; Wed, 11 Feb 2026 06:15:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9p862CvNz3jjv for ; Wed, 11 Feb 2026 06:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770790534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m3bG1pyqnk46Z8XKM/q74SX8koTLjbQ2LFMOQvbAPKQ=; b=aoxk9SDl2mrmmPUF9YHrDP4bGSmpHIBu22rd3NLtmCloy2G5rzSdL3xBU8Not5LsnHJTZt VxICIHH0EBjt5UMGqvSrH5Picl1WZ4mz0mWFt53Ek+t8KBpK8GF3o3jGoWvsZtKMLpHwaZ /KqhQdhK4uwoT55jUj4p8OtdcubG9p4X1L+sCbxhNJGQiJWeKm0fWpslNTjdpD1lo9dI1C niIHXZR+mW/yDkYnfZQi2b6hT9qoOGbYv3Z6WT/K7AhR4XGudJEbwK4qOgLsBQNT03O85N NK6BnQgSdGmVUXkk3HUcdCOB3Dd+6oeqLHVfhDyuyfKAAX+AM6VYIpqu4ewOIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770790534; a=rsa-sha256; cv=none; b=TMtjoPjockldKw6HvoBsXQ1KEc7GI4y2H+zfiWeK+rcOUhU61Fc9ue241bw6XgoOrAo8r+ X3RCKrxC+ueQgXLA9u1wIES8vQibO5LUEe9unQE3yE5sergJD7xIGuDLOCmN8LRSgPBhqy sAuAQtZ735I4aNPm1iFCEB42u0VSv7hT0i5qbtlN6yAmRoZ+tTzhjy4Pmb1myFR1bUeXfM B8vSqhFTuIGiijBeVY3N2vkPEL2NZz7t8UmbLT3VCnZP+tPqifK2Z25szT2rpiPPAHR/pK dhFxoBQNHRXacgFaXEbhYm5mDASZ7eTUp9XAR7llNpjbPX7xEvNSDxdVtN6xFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770790534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m3bG1pyqnk46Z8XKM/q74SX8koTLjbQ2LFMOQvbAPKQ=; b=AumKrx/BEs/Y85SeLhD8WPIaiAx2Sfo8kC0PyGPbWbtaw3lvjnWP6euGqV2scUb77k+W9w sV+J+oV4YT9nmoaPwu5JyAn8V94mLE13fxguYpCSZsxWY55kINzPnwFfFfUbAOA4PfOReP NJAC3FdlR2jGCMRdkNvHu/7YBwbgFjrM65AeyCOjYhDhPn7Xiwot+DcLkWqz7Gh3SLkErI ZJegDzZT9I0w13yk5e0lqiMIa5dMYa6gQ3Y2lMoC83WWLJjB1RzH69Max5hkJdE/QrhGvr eoY9oXMZhfNg0WaXGGLrL6SCCF9TqYPsMM863rsYzGq3yndZ5h8GvmNgaEjH7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9p8613V3zdgV for ; Wed, 11 Feb 2026 06:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 341bc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 06:15:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav From: Colin Percival Subject: git: 238bf5ebf684 - releng/14.4 - diff: Fix integer overflows in Stone algorithm 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: 238bf5ebf68429654caea62f00cb307d37c2a6bb Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 06:15:34 +0000 Message-Id: <698c1e86.341bc.7b95414a@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=238bf5ebf68429654caea62f00cb307d37c2a6bb commit 238bf5ebf68429654caea62f00cb307d37c2a6bb Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:43 +0000 Commit: Colin Percival CommitDate: 2026-02-11 06:14:04 +0000 diff: Fix integer overflows in Stone algorithm Fix integer overflows that may occur when the context window is very large and add tests to exercise those conditions. Approved by: re (cperciva) PR: 267032 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55110 (cherry picked from commit 5fc739eb5949620da911db2f87ca8faedc549d3a) (cherry picked from commit 237fd8dd96979412dd65ce95032aa9957463d069) --- usr.bin/diff/diffreg.c | 32 +++++++++++++++++++++----------- usr.bin/diff/tests/diff_test.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 11 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 2635c95daf6e..d4d7d6e1c9d7 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -79,6 +79,7 @@ #include #include #include +#include #include #include #include @@ -1031,7 +1032,7 @@ change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d, { static size_t max_context = 64; long curpos; - int i, nc; + int dist, i, nc; const char *walk; bool skip_blanks, ignore; @@ -1095,8 +1096,9 @@ proceed: */ print_header(file1, file2); anychange = 1; - } else if (a > context_vec_ptr->b + (2 * diff_context) + 1 && - c > context_vec_ptr->d + (2 * diff_context) + 1) { + } else if (!ckd_add(&dist, diff_context, diff_context) && + a - context_vec_ptr->b - 1 > dist && + c - context_vec_ptr->d - 1 > dist) { /* * If this change is more than 'diff_context' lines from the * previous change, dump the record and reset it. @@ -1476,10 +1478,14 @@ dump_context_vec(FILE *f1, FILE *f2, int flags) return; b = d = 0; /* gcc */ - lowa = MAX(1, cvp->a - diff_context); - upb = MIN((int)len[0], context_vec_ptr->b + diff_context); - lowc = MAX(1, cvp->c - diff_context); - upd = MIN((int)len[1], context_vec_ptr->d + diff_context); + if (ckd_sub(&lowa, cvp->a, diff_context) || lowa < 1) + lowa = 1; + if (ckd_add(&upb, context_vec_ptr->b, diff_context) || upb > (int)len[0]) + upb = (int)len[0]; + if (ckd_sub(&lowc, cvp->c, diff_context) || lowc < 1) + lowc = 1; + if (ckd_add(&upd, context_vec_ptr->d, diff_context) || upd > (int)len[1]) + upd = (int)len[1]; printf("***************"); if (flags & (D_PROTOTYPE | D_MATCHLAST)) { @@ -1579,10 +1585,14 @@ dump_unified_vec(FILE *f1, FILE *f2, int flags) return; b = d = 0; /* gcc */ - lowa = MAX(1, cvp->a - diff_context); - upb = MIN((int)len[0], context_vec_ptr->b + diff_context); - lowc = MAX(1, cvp->c - diff_context); - upd = MIN((int)len[1], context_vec_ptr->d + diff_context); + if (ckd_sub(&lowa, cvp->a, diff_context) || lowa < 1) + lowa = 1; + if (ckd_add(&upb, context_vec_ptr->b, diff_context) || upb > (int)len[0]) + upb = (int)len[0]; + if (ckd_sub(&lowc, cvp->c, diff_context) || lowc < 1) + lowc = 1; + if (ckd_add(&upd, context_vec_ptr->d, diff_context) || upd > (int)len[1]) + upd = (int)len[1]; printf("@@ -"); uni_range(lowa, upb); diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 2efb2a844078..453d82a4a3f3 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -24,6 +24,7 @@ atf_test_case functionname atf_test_case noderef atf_test_case ignorecase atf_test_case dirloop +atf_test_case verylong simple_body() { @@ -376,6 +377,32 @@ dirloop_body() diff -r a b } +bigc_head() +{ + atf_set "descr" "Context diff with very large context" +} +bigc_body() +{ + echo $'x\na\ny' >a + echo $'x\nb\ny' >b + atf_check -s exit:2 -e ignore diff -C$(((1<<31)-1)) a b + atf_check -s exit:1 -o match:'--- 1,3 ---' \ + diff -C$(((1<<31)-2)) a b +} + +bigu_head() +{ + atf_set "descr" "Unified diff with very large context" +} +bigu_body() +{ + echo $'x\na\ny' >a + echo $'x\nb\ny' >b + atf_check -s exit:2 -e ignore diff -U$(((1<<31)-1)) a b + atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ + diff -U$(((1<<31)-2)) a b +} + atf_init_test_cases() { atf_add_test_case simple @@ -403,4 +430,6 @@ atf_init_test_cases() atf_add_test_case noderef atf_add_test_case ignorecase atf_add_test_case dirloop + atf_add_test_case bigc + atf_add_test_case bigu }