From: "J. Bruce Fields" <bfields@fieldses.org>
To: steved@redhat.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH] Revert "mountd: handle allocation failures in auth_unix_ip upcall"
Date: Mon, 26 Nov 2012 17:03:43 -0500 [thread overview]
Message-ID: <20121126220343.GA18140@fieldses.org> (raw)
From: "J. Bruce Fields" <bfields@redhat.com>
This reverts commit 485f7a21e1649797f29317b865cbb094c1f6a71d. The
failures handled there could be any sort of name resolution failure, not
just an allocation, and failing to downcall (hence leaving the client
hanging) is not the correct thing to do in those cases.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---
utils/mountd/cache.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 8f14032..6710eca 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -84,6 +84,7 @@ 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;
@@ -106,16 +107,12 @@ 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);
@@ -127,9 +124,6 @@ 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)
--
1.7.11.7
next reply other threads:[~2012-11-26 22:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 22:03 J. Bruce Fields [this message]
2012-11-26 22:05 ` [PATCH] Revert "mountd: handle allocation failures in auth_unix_ip upcall" Chuck Lever
2012-11-26 22:15 ` J. Bruce Fields
2012-11-26 22:38 ` Chuck Lever
2012-11-26 22:51 ` J. Bruce Fields
2012-11-26 23:10 ` Chuck Lever
2012-11-27 14:23 ` Steve Dickson
2012-11-27 21:31 ` J. Bruce Fields
2012-11-27 21:33 ` Chuck Lever
2012-11-28 14:39 ` Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121126220343.GA18140@fieldses.org \
--to=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
--cc=steved@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).