From deedf22d7c74bec2330fd0e555d1dda49e96b26e Mon Sep 17 00:00:00 2001
Message-Id: <deedf22d7c74bec2330fd0e555d1dda49e96b26e.1715042581.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Wed, 6 Jun 2018 20:11:56 +0100
Subject: [PATCH] noip.c (acl_allows_p): Check that the ACL node address family
 is right.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

Oops.  `sockaddr_in_range_p' can't check this, because it can only see
one address family.
---
 noip.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/noip.c b/noip.c
index b10f6bb..0fab12e 100644
--- a/noip.c
+++ b/noip.c
@@ -597,7 +597,8 @@ static int acl_allows_p(const aclnode *a, const struct sockaddr *sa)
 	      present_sockaddr(sa, 0, buf, sizeof(buf))); })
   for (; a; a = a->next) {
     D( dump_aclnode(a); )
-    if (sockaddr_in_range_p(sa, &a->minaddr, &a->maxaddr) &&
+    if (a->af == sa->sa_family &&
+	sockaddr_in_range_p(sa, &a->minaddr, &a->maxaddr) &&
 	a->minport <= port && port <= a->maxport) {
       D( fprintf(stderr, "noip(%d): aha!  %s\n", pid,
 		 a->act ? "ALLOW" : "DENY"); )
-- 
[mdw]