Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id A031F1A9239 for ; Sat, 27 Nov 2021 21:43:57 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D371184EB9; Sat, 27 Nov 2021 21:43:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1C51D84EAD for ; Sat, 27 Nov 2021 21:43:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id BQf_orPtW4Hn for ; Sat, 27 Nov 2021 21:43:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7DFE284CEA for ; Sat, 27 Nov 2021 21:43:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7771EFAEC; Sat, 27 Nov 2021 21:43:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163804943565490" MIME-Version: 1.0 Date: Sat, 27 Nov 2021 21:43:55 +0000 From: "Thomas Merkel" Subject: CVS commit: [pkgsrc-2021Q3] pkgsrc/devel/gmp To: pkgsrc-changes@NetBSD.org Reply-To: tm@netbsd.org X-Mailer: log_accum Message-Id: <20211127214355.7771EFAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163804943565490 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tm Date: Sat Nov 27 21:43:55 UTC 2021 Modified Files: pkgsrc/devel/gmp [pkgsrc-2021Q3]: Makefile distinfo Added Files: pkgsrc/devel/gmp/patches [pkgsrc-2021Q3]: patch-mpz_inp__raw.c Log Message: Pullup ticket #6544 - requested by wiz devel/gmp: security fix Revisions pulled up: - devel/gmp/Makefile 1.89 - devel/gmp/distinfo 1.59 - devel/gmp/patches/patch-mpz_inp__raw.c 1.1 --- Module Name: pkgsrc Committed By: wiz Date: Fri Nov 26 12:23:09 UTC 2021 Modified Files: pkgsrc/devel/gmp: Makefile distinfo Added Files: pkgsrc/devel/gmp/patches: patch-mpz_inp__raw.c Log Message: gmp: fix CVE-2021-43618 using upstream patch Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.88.8.1 pkgsrc/devel/gmp/Makefile cvs rdiff -u -r1.56 -r1.56.8.1 pkgsrc/devel/gmp/distinfo cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/devel/gmp/patches/patch-mpz_inp__raw.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_163804943565490 Content-Disposition: inline Content-Length: 2233 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/gmp/Makefile diff -u pkgsrc/devel/gmp/Makefile:1.88 pkgsrc/devel/gmp/Makefile:1.88.8.1 --- pkgsrc/devel/gmp/Makefile:1.88 Mon Nov 16 13:12:41 2020 +++ pkgsrc/devel/gmp/Makefile Sat Nov 27 21:43:55 2021 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.88 2020/11/16 13:12:41 wiz Exp $ +# $NetBSD: Makefile,v 1.88.8.1 2021/11/27 21:43:55 tm Exp $ DISTNAME= gmp-6.2.1 +PKGREVISION= 1 CATEGORIES= devel math MASTER_SITES= https://gmplib.org/download/gmp/ MASTER_SITES+= ${MASTER_SITE_GNU:=gmp/} Index: pkgsrc/devel/gmp/distinfo diff -u pkgsrc/devel/gmp/distinfo:1.56 pkgsrc/devel/gmp/distinfo:1.56.8.1 --- pkgsrc/devel/gmp/distinfo:1.56 Mon Nov 16 13:12:41 2020 +++ pkgsrc/devel/gmp/distinfo Sat Nov 27 21:43:55 2021 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.56 2020/11/16 13:12:41 wiz Exp $ +$NetBSD: distinfo,v 1.56.8.1 2021/11/27 21:43:55 tm Exp $ SHA1 (gmp-6.2.1.tar.bz2) = 2dcf34d4a432dbe6cce1475a835d20fe44f75822 RMD160 (gmp-6.2.1.tar.bz2) = 2a4204453eb608bec6bb647ff5a0c47ca4d43878 SHA512 (gmp-6.2.1.tar.bz2) = 8904334a3bcc5c896ececabc75cda9dec642e401fb5397c4992c4fabea5e962c9ce8bd44e8e4233c34e55c8010cc28db0545f5f750cbdbb5f00af538dc763be9 Size (gmp-6.2.1.tar.bz2) = 2493916 bytes SHA1 (patch-acinclude.m4) = 3f76c0aa8d29ec815a93448f9c4bc976ebdf7a2a +SHA1 (patch-mpz_inp__raw.c) = d25995039d4c7226b5209cb932c13fe59a4578ca Added files: Index: pkgsrc/devel/gmp/patches/patch-mpz_inp__raw.c diff -u /dev/null pkgsrc/devel/gmp/patches/patch-mpz_inp__raw.c:1.1.2.2 --- /dev/null Sat Nov 27 21:43:55 2021 +++ pkgsrc/devel/gmp/patches/patch-mpz_inp__raw.c Sat Nov 27 21:43:55 2021 @@ -0,0 +1,20 @@ +$NetBSD: patch-mpz_inp__raw.c,v 1.1.2.2 2021/11/27 21:43:55 tm Exp $ + +Fix for CVE-2021-43618 +https://gmplib.org/repo/gmp-6.2/rev/561a9c25298e + +--- mpz/inp_raw.c.orig 2020-11-14 18:45:09.000000000 +0000 ++++ mpz/inp_raw.c +@@ -88,8 +88,11 @@ mpz_inp_raw (mpz_ptr x, FILE *fp) + + abs_csize = ABS (csize); + ++ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8)) ++ return 0; /* Bit size overflows */ ++ + /* round up to a multiple of limbs */ +- abs_xsize = BITS_TO_LIMBS (abs_csize*8); ++ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8); + + if (abs_xsize != 0) + { --_----------=_163804943565490--