Add the missing '$' in auth_unix_ip()
Subsystems (2)
PATCH 1/1 Add the missing '$' in auth_unix_ip()
--- utils/mountd/cache.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
utils/mountd/cache.c +6 -4
@@ -80,7 +80,7 @@ static void auth_unix_ip(FILE *f)*/ char *cp;char class[20 ]; -char ipaddr[INET6_ADDRSTRLEN ]; +char ipaddr[INET6_ADDRSTRLEN +1 ];char *client =NULL ;struct addrinfo *tmp =NULL ;if (readline (fileno (f), &lbuf, &lbuflen) !=1 )
@@ -94,7 +94,7 @@ static void auth_unix_ip(FILE *f) strcmp(class, "nfsd") != 0)return ; -if (qword_get (&cp, ipaddr,sizeof (ipaddr)) <=0 ) +if (qword_get (&cp, ipaddr,sizeof (ipaddr) -1 ) <=0 )return ; tmp =host_pton (ipaddr);
@@ -116,9 +116,11 @@ static void auth_unix_ip(FILE *f)qword_print (f,"nfsd" );qword_print (f, ipaddr);qword_printtimefrom (f,DEFAULT_TTL ); -if (use_ipaddr) +if (use_ipaddr) { +memmove (ipaddr +1 , ipaddr,strlen (ipaddr) +1 ); + ipaddr[0 ] ='$' ;qword_print (f, ipaddr); -else if (client) + }else if (client)qword_print (f, *client?client:"DEFAULT" );qword_eol (f);xlog (D_CALL ,"auth_unix_ip: client %p '%s'" , client, client?client:"DEFAULT" );
Signature · 1 line
1.7.11.7
Could you explain a little more?
I assume this is something I forgot to do as part of c2544b77566690ebec32a2d47c9249548b1a0941 "mountd: prepend '$' to make use_ipaddr clients self-describing" but I haven't thought about that in a while....
--b.
Quoted 48 lines · Jose Castillo
Signed-off-by Jose Castillo <[email protected]>--- utils/mountd/cache.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)utils/mountd/cache.c +6
-4@@ -80,7 +80,7 @@ static void auth_unix_ip(FILE *f)*/ char *cp;char class[20 ]; -char ipaddr[INET6_ADDRSTRLEN ]; +char ipaddr[INET6_ADDRSTRLEN +1 ];char *client =NULL ;struct addrinfo *tmp =NULL ;if (readline (fileno (f), &lbuf, &lbuflen) !=1 )@@ -94,7 +94,7 @@ static void auth_unix_ip(FILE *f) strcmp(class, "nfsd") != 0)return ; -if (qword_get (&cp, ipaddr,sizeof (ipaddr)) <=0 ) +if (qword_get (&cp, ipaddr,sizeof (ipaddr) -1 ) <=0 )return ; tmp =host_pton (ipaddr);@@ -116,9 +116,11 @@ static void auth_unix_ip(FILE *f)qword_print (f,"nfsd" );qword_print (f, ipaddr);qword_printtimefrom (f,DEFAULT_TTL ); -if (use_ipaddr) +if (use_ipaddr) { +memmove (ipaddr +1 , ipaddr,strlen (ipaddr) +1 ); + ipaddr[0 ] ='$' ;qword_print (f, ipaddr); -else if (client) + }else if (client)qword_print (f, *client?client:"DEFAULT" );qword_eol (f);xlog (D_CALL ,"auth_unix_ip: client %p '%s'" , client, client?client:"DEFAULT" );Signature · 6 lines
1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · J. Bruce Fields
Could you explain a little more?
I assume this is something I forgot to do as part of
c2544b77566690ebec32a2d47c9249548b1a0941"mountd: prepend '$' to makeuse_ipaddrclients self-describing" but I haven't thought about that in a while....
Hello,
Yes, sorry, a bit more of background: We found this problem because NFS clients to a RHEL6 NFS server were experiencing periods of ESTALE errors after being mounted and initially working successfully. Tests were run which snapshotted the nfs/sunrpc caches before and after the issue, and it was found that the '$' character at the beginning of the ID strings, used when in use_ipaddr mode, was getting lost:
GOOD, while mount was working:
#class IP domain
# expiry=1362416801 refcnt=2 flags=1
nfsd 1.2.3.4 $1.2.3.4
BAD, after mount started returning ESTALE:
#class IP domain
# expiry=1362418641 refcnt=2 flags=1
nfsd 1.2.3.4 1.2.3.4
This would then cause the export checks to fail by passing '1.2.3.4' instead of '$1.2.3.4' up to rpc.mountd.
The problem appears to be in the auth_unix_ip() function when renewing the auth.unix.ip cache entry. It would fail to add the '$' character back to the beginning of the string used for the domain string, breaking the use_ipaddr mode.
The issue is reliably repeatable with large numbers of exports and netgroups to cause rpc.mountd to enter use_ipaddr mode.
Steps to reproduce:
1. Export several hundred exports each with its own unique netgroup
2. Mount from a client (NFS3). check /proc/net/rpc/auth.unix.ip/content to ensure the '$' character is there from use_ipaddr mode.
3. Wait long enough for the entry to expire (1 hour was used), and try and access a file from the client. It returned ESTALE and the /proc/net/rpc/auth.unix.ip/content was now missing the '$' character.
Actual results:
Mount returns ESTALE on the client after being mounted for an extended period of time.
Expected results:
File access should succeed on the mount.
The patch was tested in a reproduction environment, and the issue could no longer be reproduced.
Quoted 34 lines
--b.
Quoted 31 lines · Jose Castillo
Signed-off-by Jose Castillo <[email protected]> ---
utils/mountd/cache.c| 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)utils/mountd/cache.c index renamed from utils/mountd/cache.c +0
-0978698d..e1027f3 100644 ---
a/utils/mountd/cache.c+++b/utils/mountd/cache.c@@ -80,7 +80,7 @@ static voidauth_unix_ip(FILE *f)*/ char *cp; char class[20]; - char
ipaddr[INET6_ADDRSTRLEN]; + char ipaddr[INET6_ADDRSTRLEN + 1];
char *client = NULL; struct addrinfo *tmp = NULL; if (readline(fileno(f), &lbuf, &lbuflen)!= 1) @@ -94,7 +94,7 @@ static voidauth_unix_ip(FILE *f)strcmp(class, "nfsd")!= 0) return;utils/mountd/cache.c index renamed from utils/mountd/cache.c +0
-1- if (qword_get(&cp, ipaddr, sizeof(ipaddr)) <= 0) + if(
qword_get(&cp, ipaddr, sizeof(ipaddr) - 1)<= 0) return;tmp =
host_pton(ipaddr); @@ -116,9 +116,11 @@ static voidauth_unix_ip(FILE *f)qword_print(f, "nfsd"); qword_print(f,
ipaddr);qword_printtimefrom(f, DEFAULT_TTL); - if (use_ipaddr) +
if (use_ipaddr) { + memmove(ipaddr + 1, ipaddr, strlen(ipaddr) +
1); + ipaddr[0] = '$';qword_print(f, ipaddr); - else if
(client) + } else if (client) qword_print(f,
*client?client:"DEFAULT");qword_eol(f); xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client:
"DEFAULT"); -- 1.7.11.7-- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html
J. Bruce Fields
Acked-byQuoted 24 lines · Jose Castillo
Quoted 7 lines · J. Bruce Fields
Could you explain a little more?
I assume this is something I forgot to do as part of
c2544b77566690ebec32a2d47c9249548b1a0941"mountd: prepend '$' to makeuse_ipaddrclients self-describing" but I haven't thought about that in a while....Hello,
Yes, sorry, a bit more of background: We found this problem because NFS clients to a RHEL6 NFS server were experiencing periods of ESTALE errors after being mounted and initially working successfully. Tests were run which snapshotted the nfs/sunrpc caches before and after the issue, and it was found that the '$' character at the beginning of the ID strings, used when in
use_ipaddrmode, was getting lost:GOOD, while mount was working:
#class IP domain
# expiry=1362416801 refcnt=2 flags=1
nfsd 1.2.3.4 $1.2.3.4
Quoted 7 lines
BAD, after mount started returning ESTALE:
#class IP domain
# expiry=1362418641 refcnt=2 flags=1
nfsd 1.2.3.4 1.2.3.4This would then cause the export checks to fail by passing '1.2.3.4' instead of '$1.2.3.4' up to rpc.mountd.
Oh, I see--and this stuff probably never worked for v4 either since it can't depend on mountd to fill the cache at all....
Thanks!
(Could you just add the extra details to the commit message and resend to steved?
Also, is there a RHEL bug for this?)
--b.
Quoted 65 lines
The problem appears to be in the
auth_unix_ip()function when renewing the auth.unix.ip cache entry. It would fail to add the '$' character back to the beginning of the string used for the domain string, breaking theuse_ipaddrmode.The issue is reliably repeatable with large numbers of exports and netgroups to cause rpc.mountd to enter
use_ipaddrmode.Steps to reproduce:
1. Export several hundred exports each with its own unique netgroup
2. Mount from a client (NFS3). check/proc/net/rpc/auth.unix.ip/contentto ensure the '$' character is there fromuse_ipaddrmode.
3. Wait long enough for the entry to expire (1 hour was used), and try and access a file from the client. It returned ESTALE and the/proc/net/rpc/auth.unix.ip/contentwas now missing the '$' character.Actual results:
Mount returns ESTALE on the client after being mounted for an extended period of time.Expected results:
File access should succeed on the mount.The patch was tested in a reproduction environment, and the issue could no longer be reproduced.
Quoted 34 lines
--b.
Quoted 31 lines · Jose Castillo
Signed-off-by Jose Castillo <[email protected]> ---
utils/mountd/cache.c| 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)utils/mountd/cache.c index renamed from utils/mountd/cache.c +0
-0978698d..e1027f3 100644 ---
a/utils/mountd/cache.c+++b/utils/mountd/cache.c@@ -80,7 +80,7 @@ static voidauth_unix_ip(FILE *f)*/ char *cp; char class[20]; - char
ipaddr[INET6_ADDRSTRLEN]; + char ipaddr[INET6_ADDRSTRLEN + 1];
char *client = NULL; struct addrinfo *tmp = NULL; if (readline(fileno(f), &lbuf, &lbuflen)!= 1) @@ -94,7 +94,7 @@ static voidauth_unix_ip(FILE *f)strcmp(class, "nfsd")!= 0) return;utils/mountd/cache.c index renamed from utils/mountd/cache.c +0
-1- if (qword_get(&cp, ipaddr, sizeof(ipaddr)) <= 0) + if(
qword_get(&cp, ipaddr, sizeof(ipaddr) - 1)<= 0) return;tmp =
host_pton(ipaddr); @@ -116,9 +116,11 @@ static voidauth_unix_ip(FILE *f)qword_print(f, "nfsd"); qword_print(f,
ipaddr);qword_printtimefrom(f, DEFAULT_TTL); - if (use_ipaddr) +
if (use_ipaddr) { + memmove(ipaddr + 1, ipaddr, strlen(ipaddr) +
1); + ipaddr[0] = '$';qword_print(f, ipaddr); - else if
(client) + } else if (client) qword_print(f,
*client?client:"DEFAULT");qword_eol(f); xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client:
"DEFAULT"); -- 1.7.11.7-- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html
Quoted 32 lines · J. Bruce Fields
Quoted 19 lines · Jose Castillo
Quoted 7 lines · J. Bruce Fields
Could you explain a little more?
I assume this is something I forgot to do as part of
c2544b77566690ebec32a2d47c9249548b1a0941"mountd: prepend '$' to makeuse_ipaddrclients self-describing" but I haven't thought about that in a while....Hello,
Yes, sorry, a bit more of background: We found this problem because NFS clients to a RHEL6 NFS server were experiencing periods of ESTALE errors after being mounted and initially working successfully. Tests were run which snapshotted the nfs/sunrpc caches before and after the issue, and it was found that the '$' character at the beginning of the ID strings, used when in
use_ipaddrmode, was getting lost:Quoted 8 lines
GOOD, while mount was working: #class IP domain # expiry=1362416801 refcnt=2 flags=1 nfsd 1.2.3.4 $1.2.3.4
BAD, after mount started returning ESTALE: #class IP domain # expiry=1362418641 refcnt=2 flags=1 nfsd 1.2.3.4 1.2.3.4
This would then cause the export checks to fail by passing '1.2.3.4' instead of '$1.2.3.4' up to rpc.mountd.
Oh, I see--and this stuff probably never worked for v4 either since it can't depend on mountd to fill the cache at all....
Quoted 7 lines
Thanks!
Acked-by J. Bruce Fields <[email protected]>(Could you just add the extra details to the commit message and resend to steved?
Done
Quoted 2 lines
Also, is there a RHEL bug for this?)
Yes, this one:
https://bugzilla.redhat.com/show_bug.cgi?id=920293
Bug 920293 - files on nfs server's exports start returning ESTALE with a large number of exports and netgroups
Thank you!
Quoted 66 lines
--b.
Quoted 64 lines
The problem appears to be in the
auth_unix_ip()function when renewing the auth.unix.ip cache entry. It would fail to add the '$' character back to the beginning of the string used for the domain string, breaking theuse_ipaddrmode.The issue is reliably repeatable with large numbers of exports and netgroups to cause rpc.mountd to enter
use_ipaddrmode.Steps to reproduce:
1. Export several hundred exports each with its own unique netgroup 2. Mount from a client (NFS3). check
/proc/net/rpc/auth.unix.ip/contentto ensure the '$' character is there fromuse_ipaddrmode. 3. Wait long enough for the entry to expire (1 hour was used), and try and access a file from the client. It returned ESTALE and the/proc/net/rpc/auth.unix.ip/contentwas now missing the '$' character.Actual results: Mount returns ESTALE on the client after being mounted for an extended period of time.
Expected results: File access should succeed on the mount.
The patch was tested in a reproduction environment, and the issue could no longer be reproduced.
Quoted 34 lines
--b.
Quoted 31 lines · Jose Castillo
Signed-off-by Jose Castillo <[email protected]> ---
utils/mountd/cache.c| 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)utils/mountd/cache.c +0
-0
b/utils/mountd/cache.c@@ -80,7 +80,7 @@ static voidauth_unix_ip(FILE *f)*/ char *cp; char class[20]; - char
ipaddr[INET6_ADDRSTRLEN]; + char ipaddr[INET6_ADDRSTRLEN +
1]; char *client = NULL; struct addrinfo *tmp = NULL; if (readline(fileno(f), &lbuf, &lbuflen)!= 1) @@ -94,7 +94,7 @@ static voidauth_unix_ip(FILE *f)strcmp(class, "nfsd")!=
0) return;utils/mountd/cache.c +0
-1-if (qword_get (&cp, ipaddr,sizeof (ipaddr)) <=0 ) + if(
qword_get(&cp, ipaddr, sizeof(ipaddr) - 1)<= 0) return;tmp =
host_pton(ipaddr); @@ -116,9 +116,11 @@ static voidauth_unix_ip(FILE *f)qword_print(f, "nfsd"); qword_print(f,
ipaddr);qword_printtimefrom(f, DEFAULT_TTL); - if
(use_ipaddr) + if (use_ipaddr) { + memmove(ipaddr + 1,
ipaddr, strlen(ipaddr) + 1); + ipaddr[0] = '$';qword_print(f, ipaddr); - else if (client) + } else if
(client)qword_print(f, *client?client:"DEFAULT");qword_eol(f);xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT"); -- 1.7.11.7-- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html
Quoted 1 line · Jose Castillo
Signed-off-by Jose Castillo <[email protected]>
Committed...
steved.
Quoted 41 lines
--- utils/mountd/cache.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)utils/mountd/cache.c +6
-4@@ -80,7 +80,7 @@ static void auth_unix_ip(FILE *f)*/ char *cp;char class[20 ]; -char ipaddr[INET6_ADDRSTRLEN ]; +char ipaddr[INET6_ADDRSTRLEN +1 ];char *client =NULL ;struct addrinfo *tmp =NULL ;if (readline (fileno (f), &lbuf, &lbuflen) !=1 )@@ -94,7 +94,7 @@ static void auth_unix_ip(FILE *f) strcmp(class, "nfsd") != 0)return ; -if (qword_get (&cp, ipaddr,sizeof (ipaddr)) <=0 ) +if (qword_get (&cp, ipaddr,sizeof (ipaddr) -1 ) <=0 )return ; tmp =host_pton (ipaddr);@@ -116,9 +116,11 @@ static void auth_unix_ip(FILE *f)qword_print (f,"nfsd" );qword_print (f, ipaddr);qword_printtimefrom (f,DEFAULT_TTL ); -if (use_ipaddr) +if (use_ipaddr) { +memmove (ipaddr +1 , ipaddr,strlen (ipaddr) +1 ); + ipaddr[0 ] ='$' ;qword_print (f, ipaddr); -else if (client) + }else if (client)qword_print (f, *client?client:"DEFAULT" );qword_eol (f);xlog (D_CALL ,"auth_unix_ip: client %p '%s'" , client, client?client:"DEFAULT" );