Date: Wed, 28 Jun 2023 09:19:17 GMT From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 02c46239ac8d - main - math/libtommath: backport patch to fix possible integer overflow Message-ID: <202306280919.35S9JHNn010731@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=02c46239ac8dce1c3573803e6c95ae152aa61ee9 commit 02c46239ac8dce1c3573803e6c95ae152aa61ee9 Author: Pietro Cerutti <gahr@FreeBSD.org> AuthorDate: 2023-06-28 08:51:31 +0000 Commit: Pietro Cerutti <gahr@FreeBSD.org> 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 <czurnieden@gmx.de> +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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306280919.35S9JHNn010731>