diff options
| author | Andreas Schwab <schwab@suse.de> | 2013-03-21 15:50:27 +0100 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2015-04-13 17:39:37 -0300 |
| commit | 002be9b8d178ace55a47dd9e2c166f217e380380 (patch) | |
| tree | a6b007190d1e20f22a71246508cad4173ae41866 /sysdeps | |
| parent | e9c2f97bf02666b01aa4af63c4e41355396acc3c (diff) | |
| download | glibc-ibm/2.16/master.zip glibc-ibm/2.16/master.tar.gz glibc-ibm/2.16/master.tar.bz2 | |
Fix stack overflow in getaddrinfo with many resultsibm/2.16/master
Conflicts:
NEWS
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index dd85130..c88e1ec 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -2467,11 +2467,27 @@ getaddrinfo (const char *name, const char *service, __typeof (once) old_once = once; __libc_once (once, gaiconf_init); /* Sort results according to RFC 3484. */ - struct sort_result results[nresults]; - size_t order[nresults]; + struct sort_result *results; + size_t *order; struct addrinfo *q; struct addrinfo *last = NULL; char *canonname = NULL; + bool malloc_results; + + malloc_results + = !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t))); + if (malloc_results) + { + results = malloc (nresults * (sizeof (*results) + sizeof (size_t))); + if (results == NULL) + { + __free_in6ai (in6ai); + return EAI_MEMORY; + } + } + else + results = alloca (nresults * (sizeof (*results) + sizeof (size_t))); + order = (size_t *) (results + nresults); /* Now we definitely need the interface information. */ if (! check_pf_called) @@ -2642,6 +2658,9 @@ getaddrinfo (const char *name, const char *service, /* Fill in the canonical name into the new first entry. */ p->ai_canonname = canonname; + + if (malloc_results) + free (results); } __free_in6ai (in6ai); |