From 85cc7449fb00ac85b0c2eecd22bd38b23f33edf5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 6 Jan 2016 08:48:44 +0100 Subject: [PATCH] gpg: Avoid using an uninitialized SALT on premature EOF. * g10/parse-packet.c (parse_key): Check for premature end of salt. -- This has no security implications because an arbitrary salt could have also been inset by an attacker. Signed-off-by: Werner Koch --- g10/parse-packet.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/g10/parse-packet.c b/g10/parse-packet.c index b0c6ee513..38cd8c9c8 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -2313,6 +2313,11 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen, case 3: for (i = 0; i < 8 && pktlen; i++, pktlen--) temp[i] = iobuf_get_noeof (inp); + if (i < 8) + { + err = gpg_error (GPG_ERR_INV_PACKET); + goto leave; + } memcpy (ski->s2k.salt, temp, 8); break; }