mountd: handle allocation failures in auth_unix_ip upcall

From: "J. Bruce Fields" <bfields@redhat.com>

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 1ae96fe41ecca26e0ff6d7003137b520f6c1ddbc..7d804322a2dfce0a45256dcb44d05297dce7ed5e 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -84,7 +84,6 @@ static void auth_unix_ip(FILE *f)
        char ipaddr[INET6_ADDRSTRLEN];
        char *client = NULL;
        struct addrinfo *tmp = NULL;
-       struct addrinfo *ai = NULL;
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
@@ -107,12 +106,16 @@ static void auth_unix_ip(FILE *f)
 
        /* addr is a valid, interesting address, find the domain name... */
        if (!use_ipaddr) {
+               struct addrinfo *ai = NULL;
+
                ai = client_resolve(tmp->ai_addr);
+               if (ai == NULL)
+                       goto out;
                client = client_compose(ai);
                freeaddrinfo(ai);
+               if (!client)
+                       goto out;
        }
-       freeaddrinfo(tmp);
-
        qword_print(f, "nfsd");
        qword_print(f, ipaddr);
        qword_printuint(f, time(0) + DEFAULT_TTL);
@@ -124,6 +127,9 @@ static void auth_unix_ip(FILE *f)
        xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
 
        free(client);
+out:
+       freeaddrinfo(tmp);
+
 }
 
 static void auth_unix_gid(FILE *f)