[PATCH] daemon.c: avoid accessing ss_family member of struct sockaddr_storage
- From
Brandon Casey <casey@nrlssc.navy.mil>
- Date
- Mar 15, 2010, 21:03 UTC
- Message-ID
- <XI3O9HirgFwPkEqC3RdYR4j56mg_uuJQZk1YFST6ukqbKXjgxaqJdNDHwlLXg5R_FVXWmWQSGmg@cipher.nrlssc.navy.mil>
- In-Reply-To
- <alpine.DEB.2.00.1003120922040.29993@cone.home.martin.st>
From: Brandon Casey <drafnel@gmail.com>
When NO_SOCKADDR_STORAGE is set for a platform, either sockaddr_in or sockaddr_in6 is used intead. Neither of which has an ss_family member. They have an sin_family and sin6_family member respectively. Since the addrcmp() function accesses the ss_family member of a sockaddr_storage struct, compilation fails on platforms which define NO_SOCKADDR_STORGAGE.
Since any sockaddr_* structure can be cast to a struct sockaddr and have its sa_family member read, do so here to workaround this issue.
Thanks to Martin Storsjö for pointing out the fix, and Gary Vaughan for drawing attention to the issue.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> --- daemon.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/daemon.c b/daemon.c index 3769b6f..8a52fdc 100644 --- a/daemon.c +++ b/daemon.c @@ -590,9 +590,11 @@ static int execute(struct sockaddr *addr) static int addrcmp(const struct sockaddr_storage *s1, const struct sockaddr_storage *s2) { - if (s1->ss_family != s2->ss_family) - return s1->ss_family - s2->ss_family; - if (s1->ss_family == AF_INET) + if (((const struct sockaddr*) s1)->sa_family != + ((const struct sockaddr*) s2)->sa_family) + return ((const struct sockaddr*) s1)->sa_family - + ((const struct sockaddr*) s2)->sa_family; + if (((const struct sockaddr*) s1)->sa_family == AF_INET) return memcmp(&((struct sockaddr_in *)s1)->sin_addr, &((struct sockaddr_in *)s2)->sin_addr, sizeof(struct in_addr));
-- 1.6.6.2