From nobody Thu Feb 5 14:45:46 2026 X-Original-To: dev-commits-src-main@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 4f6Klb2gy7z6Qdlh for ; Thu, 05 Feb 2026 14:45:46 +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 4f6KlZ0nDZz3KSq for ; Thu, 05 Feb 2026 14:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770302746; 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=UIf7WRjfELAAixCoQyjxzWvw5gvXuaZ5HiflvxHe14I=; b=rUbBBzydrj4azvxOhR+0O2IvSeEE/nIiQjOQ3vbmsmhc9f04Az8iC7tPZysOgX0XAebHdn niW92bbzLp6Gsn0kqmkx2IJTZzbJc6aCQ++/cV1afsqnHt+ixDjSbV3/HedE/W3i3hYSDZ bMvoC/2mG77xW5BgQeVNvzm6+OfU8VcXjQJ57DqPpNVdhnvj2FcR+9UZwHWq2r8XjY6k0B bMxSJvXzDp3vy7kCP9xzGNrvKIwM0la0tplZyG01UOIlJsEoTIoyLXA1eyRG78VFY7aQQx B17o+f4dZDK7EQP9/+4bKoCNwg5qCQSAR27WWg5Vy9OgSufrhEv9Rg4+gi9/8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770302746; a=rsa-sha256; cv=none; b=WS2rpIhd80b5D+R3T4zykAMxsKtCuEipuOnOXhaPPG+OEfnPAKuLD394SeQZVsNFcyAcAK gbL2Ai7LjPGaQ9xS0tGAx/YnQjLHD2tBWCz7dJFg8dwxKjVmPiWh8hMh0cOsofmt7OBlPA 7sxDfM4owg7Y5kuFuhAnwhkLb4gTPbow3pyhgDp4P1uBaUlAYT+XpdRqFWC0sdeBTQiWGf MqRprlUUFPth1UN+rWX/KHbpZtSPSVZvM34q+QfAykFNqoLe6m5HhnpFjp0uynrfQxBs1R K+iuo4I9Zj+Ws3p9j6ydooFTj8DZ4UE+LXqfkc+HH5gp2TJdUBvEnd9XJRuuqQ== 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=1770302746; 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=UIf7WRjfELAAixCoQyjxzWvw5gvXuaZ5HiflvxHe14I=; b=RiEDmNFv1CJ0iKFDL3wn1FsiCjQ/P6LXyutGJVr7rbadWEfOFUpmMYMGGYFYO2K/NzOOJ/ 7yk8VIzBQMJDl1UB0ilp5CFGsSaOXpyXaBQeOeRjsm/vpj53SblAm9+1eJWnE5YEUwCM7X Q9UKnQvqJbQgQL2E8Wfujxr6p4AnfNSWAmi+v3VwDxv8jeIDAqF3HEm9GdADGOmYiA0mdj X/01Y8UQe315MeBJSE5MuwARTfmYkhzQVsZI0BHhJrtBHty3sVEkEyhCahzbCHixsNOwES 38vPpHWMzhqLzooxt7xfhXh9GY3H8Ow0bMwNWWqJu3QPsq3VnpT6rDfQXXdAPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6KlZ0LsBzZtJ for ; Thu, 05 Feb 2026 14:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be1d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 14:45:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5fc739eb5949 - main - diff: Fix integer overflows in Stone algorithm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fc739eb5949620da911db2f87ca8faedc549d3a Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 14:45:46 +0000 Message-Id: <6984ad1a.3be1d.60ebf0ea@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5fc739eb5949620da911db2f87ca8faedc549d3a commit 5fc739eb5949620da911db2f87ca8faedc549d3a Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:39:43 +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. PR: 267032 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: thj, kevans Differential Revision: https://reviews.freebsd.org/D55110 --- usr.bin/diff/diffreg.c | 32 +++++++++++++++++++++----------- usr.bin/diff/tests/diff_test.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 11 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index ffa5568bf442..91ae5ee6591a 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -77,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -1056,7 +1057,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; @@ -1120,8 +1121,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. @@ -1506,10 +1508,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)) { @@ -1609,10 +1615,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 691b649813a1..89348d3a8b16 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() { @@ -380,6 +381,36 @@ 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 + atf_check -s exit:1 -o match:'--- 1,3 ---' \ + diff -Astone -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_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ + diff -Astone -U$(((1<<31)-2)) a b +} + atf_init_test_cases() { atf_add_test_case simple @@ -407,4 +438,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 }