Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 22:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

libceph: treat sockaddr_storage with uninitialized family as blank

Browse Source 
addr_is_blank() should return true if family is neither AF_INET nor
AF_INET6.  This is what its counterpart entity_addr_t::is_blank_ip() is
doing and it is the right thing to do: in process_banner() we check if
our address is blank and if it is "learn" it from our peer.  As it is,
we never learn our address and always send out a blank one.  This goes
way back to ceph.git commit dd732cbfc1c9 ("use sockaddr_storage; and
some ipv6 support groundwork") from 2009.

While at at, do not open-code ipv6_addr_any() and use INADDR_ANY
constant instead of 0.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Ilya Dryomov 2015-07-09 13:57:52 +03:00
parent 757856d2b9
commit c44bd69c0c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/ceph/messenger.c
View File

@ -1732,17 +1732,17 @@ static int verify_hello(struct ceph_connection *con)
static bool addr_is_blank(struct sockaddr_storage *ss) static bool addr_is_blank(struct sockaddr_storage *ss)
{ {
struct in_addr *addr = &((struct sockaddr_in *)ss)->sin_addr;
struct in6_addr *addr6 = &((struct sockaddr_in6 *)ss)->sin6_addr;
switch (ss->ss_family) { switch (ss->ss_family) {
case AF_INET: case AF_INET:
return ((struct sockaddr_in *)ss)->sin_addr.s_addr == 0; return addr->s_addr == htonl(INADDR_ANY);
case AF_INET6: case AF_INET6:
return return ipv6_addr_any(addr6);
((struct sockaddr_in6 *)ss)->sin6_addr.s6_addr32[0] == 0 && default:
((struct sockaddr_in6 *)ss)->sin6_addr.s6_addr32[1] == 0 && return true;
((struct sockaddr_in6 *)ss)->sin6_addr.s6_addr32[2] == 0 &&
((struct sockaddr_in6 *)ss)->sin6_addr.s6_addr32[3] == 0;
} }
return false;
} }
static int addr_port(struct sockaddr_storage *ss) static int addr_port(struct sockaddr_storage *ss)