* [PATCH] Fix IP address check in check_netgroup()
@ 2010-08-03 19:13 Chuck Lever
[not found] ` <20100803191107.19326.19237.stgit-x+BlCsqV7M/wdl/1UfZZQIVfYA8g3rJ/@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Chuck Lever @ 2010-08-03 19:13 UTC (permalink / raw)
To: neilb; +Cc: linux-nfs
Neil Brown reports that recent changes to replace
gethostby{addr,name}(3) with get{addr,info}name(3) may have
inadvertently broken netgroup support. There used to be a
gethostbyaddr(3) call in the third paragraph in check_netgroup().
See http://marc.info/?l=linux-nfs&m=128084830214653&w=2 .
Introduced by commit 0509d3428f523776ddd9d6e9fa318587d3ec7d84.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
Compile-tested only.
support/export/client.c | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/support/export/client.c b/support/export/client.c
index 91b17f3..0d34a55 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -583,43 +583,62 @@ static int
check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
{
const char *netgroup = clp->m_hostname + 1;
- const char *hname = ai->ai_canonname;
struct addrinfo *tmp = NULL;
struct hostent *hp;
+ char *dot, *hname;
int i, match;
- char *dot;
+
+ match = 0;
+
+ hname = strdup(ai->ai_canonname);
+ if (hname == NULL) {
+ xlog(D_GENERAL, "%s: no memory for strdup", __func__);
+ goto out;
+ }
/* First, try to match the hostname without
* splitting off the domain */
- if (innetgr(netgroup, hname, NULL, NULL))
- return 1;
+ if (innetgr(netgroup, hname, NULL, NULL)) {
+ match = 1;
+ goto out;
+ }
/* See if hname aliases listed in /etc/hosts or nis[+]
* match the requested netgroup */
hp = gethostbyname(hname);
if (hp != NULL) {
for (i = 0; hp->h_aliases[i]; i++)
- if (innetgr(netgroup, hp->h_aliases[i], NULL, NULL))
- return 1;
+ if (innetgr(netgroup, hp->h_aliases[i], NULL, NULL)) {
+ match = 1;
+ goto out;
+ }
}
/* If hname is ip address convert to FQDN */
tmp = host_pton(hname);
if (tmp != NULL) {
+ char *cname = host_canonname(tmp->ai_addr);
freeaddrinfo(tmp);
- if (innetgr(netgroup, hname, NULL, NULL))
- return 1;
+ if (cname != NULL) {
+ hname = cname;
+ if (innetgr(netgroup, hname, NULL, NULL)) {
+ match = 1;
+ goto out;
+ }
+ }
}
/* Okay, strip off the domain (if we have one) */
dot = strchr(hname, '.');
if (dot == NULL)
- return 0;
+ goto out;
*dot = '\0';
match = innetgr(netgroup, hname, NULL, NULL);
*dot = '.';
+out:
+ free(hname);
return match;
}
#else /* !HAVE_INNETGR */
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix IP address check in check_netgroup()
[not found] ` <20100803191107.19326.19237.stgit-x+BlCsqV7M/wdl/1UfZZQIVfYA8g3rJ/@public.gmane.org>
@ 2010-08-04 0:29 ` Neil Brown
2010-08-04 14:58 ` Chuck Lever
0 siblings, 1 reply; 3+ messages in thread
From: Neil Brown @ 2010-08-04 0:29 UTC (permalink / raw)
To: Chuck Lever; +Cc: linux-nfs
On Tue, 03 Aug 2010 15:13:06 -0400
Chuck Lever <chuck.lever@oracle.com> wrote:
> Neil Brown reports that recent changes to replace
> gethostby{addr,name}(3) with get{addr,info}name(3) may have
> inadvertently broken netgroup support. There used to be a
> gethostbyaddr(3) call in the third paragraph in check_netgroup().
>
> See http://marc.info/?l=linux-nfs&m=128084830214653&w=2 .
>
> Introduced by commit 0509d3428f523776ddd9d6e9fa318587d3ec7d84.
>
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Thanks Chuck - that look good, except .....
> ---
>
> Compile-tested only.
>
> support/export/client.c | 37 ++++++++++++++++++++++++++++---------
> 1 files changed, 28 insertions(+), 9 deletions(-)
>
> diff --git a/support/export/client.c b/support/export/client.c
> index 91b17f3..0d34a55 100644
> --- a/support/export/client.c
> +++ b/support/export/client.c
> @@ -583,43 +583,62 @@ static int
> check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
> {
> const char *netgroup = clp->m_hostname + 1;
> - const char *hname = ai->ai_canonname;
> struct addrinfo *tmp = NULL;
> struct hostent *hp;
> + char *dot, *hname;
> int i, match;
> - char *dot;
> +
> + match = 0;
> +
> + hname = strdup(ai->ai_canonname);
> + if (hname == NULL) {
> + xlog(D_GENERAL, "%s: no memory for strdup", __func__);
> + goto out;
> + }
>
> /* First, try to match the hostname without
> * splitting off the domain */
> - if (innetgr(netgroup, hname, NULL, NULL))
> - return 1;
> + if (innetgr(netgroup, hname, NULL, NULL)) {
> + match = 1;
> + goto out;
> + }
>
> /* See if hname aliases listed in /etc/hosts or nis[+]
> * match the requested netgroup */
> hp = gethostbyname(hname);
> if (hp != NULL) {
> for (i = 0; hp->h_aliases[i]; i++)
> - if (innetgr(netgroup, hp->h_aliases[i], NULL, NULL))
> - return 1;
> + if (innetgr(netgroup, hp->h_aliases[i], NULL, NULL)) {
> + match = 1;
> + goto out;
> + }
> }
>
> /* If hname is ip address convert to FQDN */
> tmp = host_pton(hname);
> if (tmp != NULL) {
> + char *cname = host_canonname(tmp->ai_addr);
> freeaddrinfo(tmp);
> - if (innetgr(netgroup, hname, NULL, NULL))
> - return 1;
> + if (cname != NULL) {
> + hname = cname;
You need to "free(hname)" before assigning cname to it.
Also ...
> + if (innetgr(netgroup, hname, NULL, NULL)) {
> + match = 1;
> + goto out;
> + }
> + }
> }
>
> /* Okay, strip off the domain (if we have one) */
> dot = strchr(hname, '.');
> if (dot == NULL)
> - return 0;
> + goto out;
>
> *dot = '\0';
> match = innetgr(netgroup, hname, NULL, NULL);
> *dot = '.';
It is fairly pointless to re-instate the '.' when we are about to free the
name. Not a big issue, but I thought I would mention it.
With those provisos:
Reviewed-By: NeilBrown <neilb@suse.de>
Thanks a lot!
NeilBrown
>
> +out:
> + free(hname);
> return match;
> }
> #else /* !HAVE_INNETGR */
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Fix IP address check in check_netgroup()
2010-08-04 0:29 ` Neil Brown
@ 2010-08-04 14:58 ` Chuck Lever
0 siblings, 0 replies; 3+ messages in thread
From: Chuck Lever @ 2010-08-04 14:58 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-nfs
On Aug 3, 2010, at 8:29 PM, Neil Brown wrote:
> On Tue, 03 Aug 2010 15:13:06 -0400
> Chuck Lever <chuck.lever@oracle.com> wrote:
>
>> Neil Brown reports that recent changes to replace
>> gethostby{addr,name}(3) with get{addr,info}name(3) may have
>> inadvertently broken netgroup support. There used to be a
>> gethostbyaddr(3) call in the third paragraph in check_netgroup().
>>
>> See http://marc.info/?l=linux-nfs&m=128084830214653&w=2 .
>>
>> Introduced by commit 0509d3428f523776ddd9d6e9fa318587d3ec7d84.
>>
>> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
>
> Thanks Chuck - that look good, except .....
>
>
>> ---
>>
>> Compile-tested only.
>>
>> support/export/client.c | 37 ++++++++++++++++++++++++++++---------
>> 1 files changed, 28 insertions(+), 9 deletions(-)
>>
>> diff --git a/support/export/client.c b/support/export/client.c
>> index 91b17f3..0d34a55 100644
>> --- a/support/export/client.c
>> +++ b/support/export/client.c
>> @@ -583,43 +583,62 @@ static int
>> check_netgroup(const nfs_client *clp, const struct addrinfo *ai)
>> {
>> const char *netgroup = clp->m_hostname + 1;
>> - const char *hname = ai->ai_canonname;
>> struct addrinfo *tmp = NULL;
>> struct hostent *hp;
>> + char *dot, *hname;
>> int i, match;
>> - char *dot;
>> +
>> + match = 0;
>> +
>> + hname = strdup(ai->ai_canonname);
>> + if (hname == NULL) {
>> + xlog(D_GENERAL, "%s: no memory for strdup", __func__);
>> + goto out;
>> + }
>>
>> /* First, try to match the hostname without
>> * splitting off the domain */
>> - if (innetgr(netgroup, hname, NULL, NULL))
>> - return 1;
>> + if (innetgr(netgroup, hname, NULL, NULL)) {
>> + match = 1;
>> + goto out;
>> + }
>>
>> /* See if hname aliases listed in /etc/hosts or nis[+]
>> * match the requested netgroup */
>> hp = gethostbyname(hname);
>> if (hp != NULL) {
>> for (i = 0; hp->h_aliases[i]; i++)
>> - if (innetgr(netgroup, hp->h_aliases[i], NULL, NULL))
>> - return 1;
>> + if (innetgr(netgroup, hp->h_aliases[i], NULL, NULL)) {
>> + match = 1;
>> + goto out;
>> + }
>> }
>>
>> /* If hname is ip address convert to FQDN */
>> tmp = host_pton(hname);
>> if (tmp != NULL) {
>> + char *cname = host_canonname(tmp->ai_addr);
>> freeaddrinfo(tmp);
>> - if (innetgr(netgroup, hname, NULL, NULL))
>> - return 1;
>> + if (cname != NULL) {
>> + hname = cname;
>
> You need to "free(hname)" before assigning cname to it.
> Also ...
>
>> + if (innetgr(netgroup, hname, NULL, NULL)) {
>> + match = 1;
>> + goto out;
>> + }
>> + }
>> }
>>
>> /* Okay, strip off the domain (if we have one) */
>> dot = strchr(hname, '.');
>> if (dot == NULL)
>> - return 0;
>> + goto out;
>>
>> *dot = '\0';
>> match = innetgr(netgroup, hname, NULL, NULL);
>> *dot = '.';
>
> It is fairly pointless to re-instate the '.' when we are about to free the
> name. Not a big issue, but I thought I would mention it.
>
> With those provisos:
> Reviewed-By: NeilBrown <neilb@suse.de>
Agreed, to both comments. I'll fix these and post a more final version for Steve.
> Thanks a lot!
>
> NeilBrown
>
>>
>> +out:
>> + free(hname);
>> return match;
>> }
>> #else /* !HAVE_INNETGR */
--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-04 15:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-03 19:13 [PATCH] Fix IP address check in check_netgroup() Chuck Lever
[not found] ` <20100803191107.19326.19237.stgit-x+BlCsqV7M/wdl/1UfZZQIVfYA8g3rJ/@public.gmane.org>
2010-08-04 0:29 ` Neil Brown
2010-08-04 14:58 ` Chuck Lever
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.