From nobody Wed Jun 28 09:19:17 2023 X-Original-To: dev-commits-ports-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 4Qrbck26W6z4jtq0; Wed, 28 Jun 2023 09:19:18 +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 4Qrbcj5j2Yz3nrV; Wed, 28 Jun 2023 09:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687943957; 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=RDoLJBV2ksNVn8bc0iWX9+fmYaonoHjD6IOqRCGE/JE=; b=IieBXWKm2RT2WnFD3W/iArQyBiNRjlTj5MHk01zzd/ccawCwF3c5yb8/4eflM2E/0zWnM1 bicm3k8nRXOXAHzS8jrQ1vWGEH52vc4VXpwKRmXEGpBwU/nEkL6dXJSP6mnuqp9z5EZGzf AXssu0JaSG6wGEtHZnuVl+mQTyYUVktjcGfVcPV1q3KtlJrkUDMNKfDSqWAHMpUB3gTayO r9EMLtmukPLdyNhT1q3Nbgf6JICl+5zJ6wTzF8YTRYTnRaTHO95rHCYh5jbpS+m9zsLwa+ rwxx1DnCXlQz8R44AXCKIFV6VbFi+EyW82Pq27OSCyKnmdyGU/651oLwrANgYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687943957; 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=RDoLJBV2ksNVn8bc0iWX9+fmYaonoHjD6IOqRCGE/JE=; b=csfYPJaSDC/MeRY+r/ruzLPmVVMgJUDltBaR19rwsp1UN1LrCDDjhfAYELBiLNDcYk/q82 +7UP45rpZIHjRUhiGA8SdfHX1qAgHowBSXttAgd9LvCWx357Dq+Tno+oqJFjr0NrdKFvsH EoxwmUqYlEgJAw+u9Gohw+3Kfx7glQCALlR4aw+dU8XBAFC1/DTQNMzXyQ/XKJq4xceCsN GHeiNeVbbSTEjRjYpuAHr6PdUyT5fYpc5AT6F2WnOnnSuTM2QIuyI30jEoRrFsi6Y5vWt4 12wZXvcSs/tvxYmo9ZaC7N63Gc05J0g9LUOm6Vat6hYn5wHndQ9v+Uqr6VKkHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687943957; a=rsa-sha256; cv=none; b=rDPfAXDlNKRgce190sGA/VY5TGiNH3IK8KXu9RXmGNTH/yRq79RninW3YwYYitS1QmapCl rmqYV36fXhcWOAGdvb0eoeEc/AE6xrpv8clRne3av0lJk32ZlnEEpKAtlKBMIsgr3ePoxd YTw05I5XaqjZmdnmLeXRlX40T3g/dVxeE1oc0GvkTA7q7WYaMgo11qZTTKaFS4zoFGX116 NzZRoeFEluIYit/BHo6GlmDeS0tUMUQERI5Ir6SvTITLuCfCK6xH5PQWfTsjQkAQ2NXGTq yJyQhaM17j2znZsqYBOlqqoNdxtgOWvtfLDxIh8xW7al4c9lX9tfJU3SXZ3jMw== 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 4Qrbcj4nzGzT51; Wed, 28 Jun 2023 09:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35S9JHuA010732; Wed, 28 Jun 2023 09:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35S9JHNn010731; Wed, 28 Jun 2023 09:19:17 GMT (envelope-from git) Date: Wed, 28 Jun 2023 09:19:17 GMT Message-Id: <202306280919.35S9JHNn010731@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: 02c46239ac8d - main - math/libtommath: backport patch to fix possible integer overflow List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02c46239ac8dce1c3573803e6c95ae152aa61ee9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=02c46239ac8dce1c3573803e6c95ae152aa61ee9 commit 02c46239ac8dce1c3573803e6c95ae152aa61ee9 Author: Pietro Cerutti AuthorDate: 2023-06-28 08:51:31 +0000 Commit: Pietro Cerutti CommitDate: 2023-06-28 09:19:15 +0000 math/libtommath: backport patch to fix possible integer overflow --- math/libtommath/Makefile | 2 +- math/libtommath/files/patch-beba89 | 137 +++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/math/libtommath/Makefile b/math/libtommath/Makefile index 9569b08ad9c5..7c35694132c8 100644 --- a/math/libtommath/Makefile +++ b/math/libtommath/Makefile @@ -1,6 +1,6 @@ PORTNAME= libtommath DISTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= https://github.com/libtom/libtommath/releases/download/v${DISTVERSION}/ DISTNAME= ltm-${DISTVERSION} diff --git a/math/libtommath/files/patch-beba89 b/math/libtommath/files/patch-beba89 new file mode 100644 index 000000000000..c157ec911a48 --- /dev/null +++ b/math/libtommath/files/patch-beba89 @@ -0,0 +1,137 @@ +From beba892bc0d4e4ded4d667ab1d2a94f4d75109a9 Mon Sep 17 00:00:00 2001 +From: czurnieden +Date: Tue, 9 May 2023 17:17:12 +0200 +Subject: [PATCH] Fix possible integer overflow + +---.orig + bn_mp_2expt.c | 4 ++++ + bn_mp_grow.c | 4 ++++ + bn_mp_init_size.c | 5 +++++ + bn_mp_mul_2d.c | 4 ++++ + bn_s_mp_mul_digs.c | 4 ++++ + bn_s_mp_mul_digs_fast.c | 4 ++++ + bn_s_mp_mul_high_digs.c | 4 ++++ + bn_s_mp_mul_high_digs_fast.c | 4 ++++ + 8 files changed, 33 insertions(+) + +diff --git bn_mp_2expt.c bn_mp_2expt.c +index 0ae3df1bf..23de0c3c5 100644 +--- bn_mp_2expt.c.orig ++++ bn_mp_2expt.c +@@ -12,6 +12,10 @@ mp_err mp_2expt(mp_int *a, int b) + { + mp_err err; + ++ if (b < 0) { ++ return MP_VAL; ++ } ++ + /* zero a as per default */ + mp_zero(a); + +diff --git bn_mp_grow.c bn_mp_grow.c +index 9e904c547..2b1682651 100644 +--- bn_mp_grow.c.orig ++++ bn_mp_grow.c +@@ -9,6 +9,10 @@ mp_err mp_grow(mp_int *a, int size) + int i; + mp_digit *tmp; + ++ if (size < 0) { ++ return MP_VAL; ++ } ++ + /* if the alloc size is smaller alloc more ram */ + if (a->alloc < size) { + /* reallocate the array a->dp +diff --git bn_mp_init_size.c bn_mp_init_size.c +index d62268721..99573833f 100644 +--- bn_mp_init_size.c.orig ++++ bn_mp_init_size.c +@@ -6,6 +6,11 @@ + /* init an mp_init for a given size */ + mp_err mp_init_size(mp_int *a, int size) + { ++ ++ if (size < 0) { ++ return MP_VAL; ++ } ++ + size = MP_MAX(MP_MIN_PREC, size); + + /* alloc mem */ +diff --git bn_mp_mul_2d.c bn_mp_mul_2d.c +index 87354de20..bfeaf2eb2 100644 +--- bn_mp_mul_2d.c.orig ++++ bn_mp_mul_2d.c +@@ -9,6 +9,10 @@ mp_err mp_mul_2d(const mp_int *a, int b, mp_int *c) + mp_digit d; + mp_err err; + ++ if (b < 0) { ++ return MP_VAL; ++ } ++ + /* copy */ + if (a != c) { + if ((err = mp_copy(a, c)) != MP_OKAY) { +diff --git bn_s_mp_mul_digs.c bn_s_mp_mul_digs.c +index 64509d4cb..3682b4980 100644 +--- bn_s_mp_mul_digs.c.orig ++++ bn_s_mp_mul_digs.c +@@ -16,6 +16,10 @@ mp_err s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs) + mp_word r; + mp_digit tmpx, *tmpt, *tmpy; + ++ if (digs < 0) { ++ return MP_VAL; ++ } ++ + /* can we use the fast multiplier? */ + if ((digs < MP_WARRAY) && + (MP_MIN(a->used, b->used) < MP_MAXFAST)) { +diff --git bn_s_mp_mul_digs_fast.c bn_s_mp_mul_digs_fast.c +index b2a287b02..3c4176a87 100644 +--- bn_s_mp_mul_digs_fast.c.orig ++++ bn_s_mp_mul_digs_fast.c +@@ -26,6 +26,10 @@ mp_err s_mp_mul_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int digs) + mp_digit W[MP_WARRAY]; + mp_word _W; + ++ if (digs < 0) { ++ return MP_VAL; ++ } ++ + /* grow the destination as required */ + if (c->alloc < digs) { + if ((err = mp_grow(c, digs)) != MP_OKAY) { +diff --git bn_s_mp_mul_high_digs.c bn_s_mp_mul_high_digs.c +index 2bb2a5098..c9dd355f8 100644 +--- bn_s_mp_mul_high_digs.c.orig ++++ bn_s_mp_mul_high_digs.c +@@ -15,6 +15,10 @@ mp_err s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs) + mp_word r; + mp_digit tmpx, *tmpt, *tmpy; + ++ if (digs < 0) { ++ return MP_VAL; ++ } ++ + /* can we use the fast multiplier? */ + if (MP_HAS(S_MP_MUL_HIGH_DIGS_FAST) + && ((a->used + b->used + 1) < MP_WARRAY) +diff --git bn_s_mp_mul_high_digs_fast.c bn_s_mp_mul_high_digs_fast.c +index a2c4fb692..4ce7f590c 100644 +--- bn_s_mp_mul_high_digs_fast.c.orig ++++ bn_s_mp_mul_high_digs_fast.c +@@ -19,6 +19,10 @@ mp_err s_mp_mul_high_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int + mp_digit W[MP_WARRAY]; + mp_word _W; + ++ if (digs < 0) { ++ return MP_VAL; ++ } ++ + /* grow the destination as required */ + pa = a->used + b->used; + if (c->alloc < pa) {