Skip to content

Commit

Permalink
Core: sockaddr lengths now respected by ngx_cmp_sockaddr().
Browse files Browse the repository at this point in the history
Linux can return AF_UNIX sockaddrs with partially filled sun_path,
resulting in spurious comparison failures and failed binary upgrades.
Added proper checking of the lengths provided.

Reported by Jan Seda,
http://mailman.nginx.org/pipermail/nginx-devel/2016-September/008832.html.
  • Loading branch information
mdounin committed Oct 10, 2016
1 parent 4c4fdc4 commit f594b2b
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions src/core/ngx_inet.c
Original file line number Diff line number Diff line change
Expand Up @@ -1364,6 +1364,7 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
struct sockaddr_in6 *sin61, *sin62;
#endif
#if (NGX_HAVE_UNIX_DOMAIN)
size_t len;
struct sockaddr_un *saun1, *saun2;
#endif

Expand Down Expand Up @@ -1393,15 +1394,21 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, socklen_t slen1,
#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:

/* TODO length */

saun1 = (struct sockaddr_un *) sa1;
saun2 = (struct sockaddr_un *) sa2;

if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path,
sizeof(saun1->sun_path))
!= 0)
{
if (slen1 < slen2) {
len = slen1 - offsetof(struct sockaddr_un, sun_path);

} else {
len = slen2 - offsetof(struct sockaddr_un, sun_path);
}

if (len > sizeof(saun1->sun_path)) {
len = sizeof(saun1->sun_path);
}

if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path, len) != 0) {
return NGX_DECLINED;
}

Expand Down

0 comments on commit f594b2b

Please sign in to comment.