security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-02 16:43:03 +01:00
Code Activity

gpg: Fix off-by-one read in the attribute subpacket parser.

Browse Source 
* g10/parse-packet.c (parse_attribute_subpkts): Check that the
attribute packet is large enough for the subpacket type.
--

Reported-by: Hanno Böck
Signed-off-by: Werner Koch <wk@gnupg.org>

(backported from commit 0988764397f99db4efef1eabcdb8072d6159af76)
This commit is contained in:
Werner Koch 2014-11-24 19:12:37 +01:00
parent 92a7949ae6
commit 7a068ac50b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/parse-packet.c
View File

@ -2102,6 +2102,14 @@ parse_attribute_subpkts(PKT_user_id *uid)
if( buflen < n ) if( buflen < n )
goto too_short; goto too_short;
if (!n)
{
/* Too short to encode the subpacket type. */
if (opt.verbose)
log_info ("attribute subpacket too short\n");
break;
}
attribs=xrealloc(attribs,(count+1)*sizeof(struct user_attribute)); attribs=xrealloc(attribs,(count+1)*sizeof(struct user_attribute));
memset(&attribs[count],0,sizeof(struct user_attribute)); memset(&attribs[count],0,sizeof(struct user_attribute));