security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

dirmngr,gpgsm: Return NULL on fail

Browse Source 
* dirmngr/ldapserver.c (ldapserver_parse_one): Set SERVER to NULL.
* sm/gpgsm.c (parse_keyserver_line): Ditto.
--

Reported-by: Joshua Rogers <git@internot.info>

  "If something inside the ldapserver_parse_one function failed,
   'server' would be freed, then returned, leading to a
   use-after-free.  This code is likely copied from sm/gpgsm.c, which
   was also susceptible to this bug."

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2014-12-22 12:16:46 +01:00
parent bdc8efbdd1
commit abd5f6752d
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dirmngr/ldapserver.c
View File

@ -125,6 +125,7 @@ ldapserver_parse_one (char *line,
{ {
log_info (_("%s:%u: skipping this line\n"), filename, lineno); log_info (_("%s:%u: skipping this line\n"), filename, lineno);
ldapserver_list_free (server); ldapserver_list_free (server);
server = NULL;
} }
return server; return server;

1
sm/gpgsm.c
View File

@ -862,6 +862,7 @@ parse_keyserver_line (char *line,
{ {
log_info (_("%s:%u: skipping this line\n"), filename, lineno); log_info (_("%s:%u: skipping this line\n"), filename, lineno);
keyserver_list_free (server); keyserver_list_free (server);
server = NULL;
} }
return server; return server;