Commit 9db619e6 authored by Wolfgang Walter's avatar Wolfgang Walter Committed by Linus Torvalds

rpc: fix garbage in printk in svc_tcp_accept()

we upgraded the kernel of a nfs-server from 2.6.17.11 to 2.6.22.6. Since
then we get the message

lockd: too many open TCP sockets, consider increasing the number of nfsd threads
lockd: last TCP connect from ^\\236^\É^D

These random characters in the second line are caused by a bug in
svc_tcp_accept.

(Note: there are two previous __svc_print_addr(sin, buf, sizeof(buf))
calls in this function, either of which would initialize buf correctly;
but both are inside "if"'s and are not necessarily executed.  This is
less obvious in the second case, which is inside a dprintk(), which is a
macro which expands to an if statement.)
Signed-off-by: default avatarWolfgang Walter <wolfgang.walter@studentenwerk.mhn.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f685ddaf
...@@ -1110,7 +1110,8 @@ svc_tcp_accept(struct svc_sock *svsk) ...@@ -1110,7 +1110,8 @@ svc_tcp_accept(struct svc_sock *svsk)
serv->sv_name); serv->sv_name);
printk(KERN_NOTICE printk(KERN_NOTICE
"%s: last TCP connect from %s\n", "%s: last TCP connect from %s\n",
serv->sv_name, buf); serv->sv_name, __svc_print_addr(sin,
buf, sizeof(buf)));
} }
/* /*
* Always select the oldest socket. It's not fair, * Always select the oldest socket. It's not fair,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment