From: Efraim Flashner <efraim@flashner.co.il>
To: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org
Subject: Re: cracklib: Fix buffer overflow
Date: Tue, 20 Sep 2016 12:32:02 +0300 [thread overview]
Message-ID: <20160920093201.GB17906@macbook42.flashner.co.il> (raw)
In-Reply-To: <20160915153646.GA31020@jasmine>
[-- Attachment #1: Type: text/plain, Size: 4548 bytes --]
On Thu, Sep 15, 2016 at 11:36:46AM -0400, Leo Famulari wrote:
> This patch cherry-picks an upstream commit to fix a buffer overflow in
> cracklib. Please see the patch file for more information about the bug.
> From 62f8f1763ba1766e92e8dc05686bd9353eaf2ad5 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Thu, 15 Sep 2016 11:34:49 -0400
> Subject: [PATCH] gnu: cracklib: Fix buffer overflow.
>
> * gnu/packages/patches/cracklib-fix-buffer-overflow.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/password-utils.scm (cracklib)[source]: Use it.
> ---
> gnu/local.mk | 1 +
> gnu/packages/password-utils.scm | 3 +-
> .../patches/cracklib-fix-buffer-overflow.patch | 39 ++++++++++++++++++++++
> 3 files changed, 42 insertions(+), 1 deletion(-)
> create mode 100644 gnu/packages/patches/cracklib-fix-buffer-overflow.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index a7006cb..ab052af 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -473,6 +473,7 @@ dist_patch_DATA = \
> %D%/packages/patches/cpio-CVE-2016-2037.patch \
> %D%/packages/patches/cpufrequtils-fix-aclocal.patch \
> %D%/packages/patches/cracklib-CVE-2016-6318.patch \
> + %D%/packages/patches/cracklib-fix-buffer-overflow.patch \
> %D%/packages/patches/crda-optional-gcrypt.patch \
> %D%/packages/patches/crossmap-allow-system-pysam.patch \
> %D%/packages/patches/csound-header-ordering.patch \
> diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
> index 7288da6..40ed933 100644
> --- a/gnu/packages/password-utils.scm
> +++ b/gnu/packages/password-utils.scm
> @@ -160,7 +160,8 @@ and vice versa.")
> (uri (string-append "https://github.com/cracklib/cracklib/"
> "releases/download/" name "-" version "/"
> name "-" version ".tar.gz"))
> - (patches (search-patches "cracklib-CVE-2016-6318.patch"))
> + (patches (search-patches "cracklib-CVE-2016-6318.patch"
> + "cracklib-fix-buffer-overflow.patch"))
> (sha256
> (base32
> "0hrkb0prf7n92w6rxgq0ilzkk6rkhpys2cfqkrbzswp27na7dkqp"))))
> diff --git a/gnu/packages/patches/cracklib-fix-buffer-overflow.patch b/gnu/packages/patches/cracklib-fix-buffer-overflow.patch
> new file mode 100644
> index 0000000..b1c990f
> --- /dev/null
> +++ b/gnu/packages/patches/cracklib-fix-buffer-overflow.patch
> @@ -0,0 +1,39 @@
> +Fix buffer overflow processing long words in Mangle().
> +
> +Patch adpated from upstream commit, omitting changes to 'NEWS':
> +
> +https://github.com/cracklib/cracklib/commit/33d7fa4585247cd2247a1ffa032ad245836c6edb
> +
> +From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001
> +From: Jan Dittberner <jan@dittberner.info>
> +Date: Thu, 25 Aug 2016 17:17:53 +0200
> +Subject: [PATCH] Fix a buffer overflow processing long words
> +
> +A buffer overflow processing long words has been discovered. This commit
> +applies the patch from
> +https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch
> +by Howard Guo.
> +
> +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and
> +http://www.openwall.com/lists/oss-security/2016/08/23/8
> +---
> + src/NEWS | 1 +
> + src/lib/rules.c | 5 ++---
> + 2 files changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/src/lib/rules.c b/src/lib/rules.c
> +index d193cc0..3a2aa46 100644
> +--- a/lib/rules.c
> ++++ b/lib/rules.c
> +@@ -434,9 +434,8 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */
> + {
> + int limit;
> + register char *ptr;
> +- static char area[STRINGSIZE];
> +- char area2[STRINGSIZE];
> +- area[0] = '\0';
> ++ static char area[STRINGSIZE * 2] = {0};
> ++ char area2[STRINGSIZE * 2] = {0};
> + strcpy(area, input);
> +
> + for (ptr = control; *ptr; ptr++)
> --
> 2.10.0
>
not having looked at the full source of lib/rules.c, is there a maximum
value to STRINGSIZE to make sure STRINGSIZE * 2 doesn't wrap around?
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-09-20 9:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 15:36 cracklib: Fix buffer overflow Leo Famulari
2016-09-20 9:32 ` Efraim Flashner [this message]
2016-09-20 17:43 ` Leo Famulari
2017-01-10 20:33 ` Leo Famulari
2017-01-10 21:44 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160920093201.GB17906@macbook42.flashner.co.il \
--to=efraim@flashner.co.il \
--cc=guix-devel@gnu.org \
--cc=leo@famulari.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.