9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libratbox/src/commio.c: Must set addrlen before every call to accept()

Browse source 
If an IPv4 connection is dropped by the pre-callback, and there is a
pending IPv6 connection on the same listening socket then the retried
accept() will be unable to populate `st` because `addrlen` will be too
small. Also initialise `st` each time to avoid a clang static analysis
warning.
This commit is contained in:
Simon Arlott 2017-07-29 21:38:34 +01:00 committed by Aaron Jones
parent e09aeac9ed
commit ea3ca814f5
No known key found for this signature in database
GPG key ID: 8AF0737488AB3012
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libratbox/src/commio.c
View file

@ -336,11 +336,14 @@ rb_accept_tryaccept(rb_fde_t *F, void *data)
{
struct rb_sockaddr_storage st;
rb_fde_t *new_F;
rb_socklen_t addrlen = sizeof(st);
rb_socklen_t addrlen;
int new_fd;
while(1)
{
(void) memset(&st, 0x00, sizeof st);
addrlen = (rb_socklen_t) sizeof st;
new_fd = accept(F->fd, (struct sockaddr *)&st, &addrlen);
rb_get_errno();
if(new_fd < 0)
@ -742,9 +745,6 @@ mangle_mapped_sockaddr(struct sockaddr *in)
{
struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)in;
if(in->sa_family == AF_INET)
return;
if(in->sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&in6->sin6_addr))
{
struct sockaddr_in in4;
@ -754,7 +754,6 @@ mangle_mapped_sockaddr(struct sockaddr *in)
in4.sin_addr.s_addr = ((uint32_t *)&in6->sin6_addr)[3];
memcpy(in, &in4, sizeof(struct sockaddr_in));
}
return;
}
#endif