Upstream-Status: Backport CVE: CVE-2015-7696 Signed-off-by: Tudor Florea From 68efed87fabddd450c08f3112f62a73f61d493c9 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Mon, 14 Sep 2015 18:23:17 +0200 Subject: [PATCH 1/2] upstream fix for heap overflow https://bugzilla.redhat.com/attachment.cgi?id=1073002 --- crypt.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/crypt.c b/crypt.c index 784e411..a8975f2 100644 --- a/crypt.c +++ b/crypt.c @@ -465,7 +465,17 @@ int decrypt(__G__ passwrd) GLOBAL(pInfo->encrypted) = FALSE; defer_leftover_input(__G); for (n = 0; n < RAND_HEAD_LEN; n++) { - b = NEXTBYTE; + /* 2012-11-23 SMS. (OUSPG report.) + * Quit early if compressed size < HEAD_LEN. The resulting + * error message ("unable to get password") could be improved, + * but it's better than trying to read nonexistent data, and + * then continuing with a negative G.csize. (See + * fileio.c:readbyte()). + */ + if ((b = NEXTBYTE) == (ush)EOF) + { + return PK_ERR; + } h[n] = (uch)b; Trace((stdout, " (%02x)", h[n])); } -- 2.4.6