From nobody Tue Feb 10 15:28:14 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 4f9QSJ0rvPz6RVcQ for ; Tue, 10 Feb 2026 15:28:15 +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 4f9QSH0bj4z475J for ; Tue, 10 Feb 2026 15:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770737295; 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=vLHuWYA0e5OxyzIJg+Bdl2gGKEibvcRND6T7JbuGvYM=; b=EHKgdkcUks3mj3WKcK6XYUSKV3luDszz/O/6u+uEDaB86u83JheEiB0cLx+BvnQOctEUVC qlevPuM4y/IRp9yzOOccynTy8XL10w0bimmgvAbNreUiLRe7KUpoiC0pNxtguY0m0JzHOJ tVCdmrWkkqgXgH4GZ/kqD+qrA7n7OVy6RZxS8AhJ3i+qoePSgtxXTCdxqjym79Ma0fBs/8 BoHZOzSwAJRaOsQgbI5o59DO5WmEkrN2ICKRkPQbrNjsj63oXbAjxIIJVZXRxSVjN2EikZ PjITnFVRugB9/yoZqzDNgdK0t06aUn0pKyz2w6kfyxSaDlFSlApC3RZzZvdF+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770737295; a=rsa-sha256; cv=none; b=MeDKNbpt8XE707rQwi9V8u4Kt2fS9CMryyTXtHZtI6fQyaU7zCvlH8T6Y4ziad3iRGUaUA 6gjcz0kEnflGVW7Ucj9DaqLdYJbtxzblV65acBCXvun3yGKDorhc69j5F58A0f+PqaF97n jGQRoYt7NXAsPBv+hLrLv+L6rSjqmMUeYq7FBVGgZ6UuvBr0atNImSoeUxASfUsPB/hR+h V8FlAWsarP0qXEnOWKRVajUCJFHOryPbWpVyz9puE7h1WAiwP28PxbEC61E53ZmN42QHMQ Zq6qGnXMxQsOVIM4DeLi9MDRa0RmIAQFM1jB8dPRiiRQ8J7LdZeceWwIb7ohrA== 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=1770737295; 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=vLHuWYA0e5OxyzIJg+Bdl2gGKEibvcRND6T7JbuGvYM=; b=Qi/xc+nkaT5VwYetHz1ANzbLuijJ4u45fvzh3U9hFdxZ26xxkx3xZv585JvG9rXhOFYM54 wpjQShB4Iemyevx7sNEwyFl+6QcWRRe8vJLKQ96Kw5gndodvTLgbo3rM6jMPHFmETYgM0R 1izWFFshvK+mSpZA6S5fmAxv+rAPndQryVdXhoL+MGPSGPVsB6KvqcWrtDRxUpDwuVS8Wo XVBCBDf8Dp0k87YGqfR6NFhuAdNzOGIbha1N9JYcZ77F5VQiNECMhgTkqmJEsMQXUTCeJG ks49DoXTny4ZTFL7Stm3iJxQratp4OSk6DtCEGU1MrcgNp/fgCqdqVDS1wNZrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9QSG62nvz1MXk for ; Tue, 10 Feb 2026 15:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45e6a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:28:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2ae615c4f1d0 - stable/13 - 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ae615c4f1d0c29984caac73d72091be8c41358f Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:28:14 +0000 Message-Id: <698b4e8e.45e6a.5271ab8e@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2ae615c4f1d0c29984caac73d72091be8c41358f commit 2ae615c4f1d0c29984caac73d72091be8c41358f Author: Dag-Erling Smørgrav AuthorDate: 2026-02-05 14:39:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 14:24:30 +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 (cherry picked from commit 5fc739eb5949620da911db2f87ca8faedc549d3a) --- usr.bin/diff/diffreg.c | 32 +++++++++++++++++++++----------- usr.bin/diff/tests/diff_test.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index fb01fa24a281..ea7732bb6d99 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -78,6 +78,7 @@ #include #include #include +#include #include #include #include @@ -1064,7 +1065,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; @@ -1125,8 +1126,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. @@ -1490,10 +1492,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)) { @@ -1593,10 +1599,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 027febf69f64..8b8846925ee8 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -20,6 +20,8 @@ atf_test_case report_identical atf_test_case non_regular_file atf_test_case binary atf_test_case dirloop +atf_test_case bigc +atf_test_case bigu simple_body() { @@ -300,6 +302,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 @@ -323,4 +351,6 @@ atf_init_test_cases() atf_add_test_case non_regular_file atf_add_test_case binary atf_add_test_case dirloop + atf_add_test_case bigc + atf_add_test_case bigu }