UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

SUNRPC: Switch one_sock_name() to use snprintf() 

Use snprintf() in one_sock_name() to prevent overflowing the output
buffer.  If the name doesn't fit in the buffer, the buffer is filled
in with an empty string, and -ENAMETOOLONG is returned.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Chuck Lever 2009-04-23 19:32:48 -04:00 committed by J. Bruce Fields
parent 8435d34dbb
commit e7942b9f25
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net/sunrpc/svcsock.c
View File

@ -240,22 +240,27 @@ out:
/* /*
* Report socket names for nfsdfs * Report socket names for nfsdfs
*/ */
static int one_sock_name(char *buf, struct svc_sock *svsk) static int svc_one_sock_name(struct svc_sock *svsk, char *buf, int remaining)
{ {
int len; int len;
switch(svsk->sk_sk->sk_family) { switch(svsk->sk_sk->sk_family) {
case AF_INET: case PF_INET:
len = sprintf(buf, "ipv4 %s %pI4 %d\n", len = snprintf(buf, remaining, "ipv4 %s %pI4 %d\n",
svsk->sk_sk->sk_protocol == IPPROTO_UDP ? svsk->sk_sk->sk_protocol == IPPROTO_UDP ?
"udp" : "tcp", "udp" : "tcp",
&inet_sk(svsk->sk_sk)->rcv_saddr, &inet_sk(svsk->sk_sk)->rcv_saddr,
inet_sk(svsk->sk_sk)->num); inet_sk(svsk->sk_sk)->num);
break; break;
default: default:
len = sprintf(buf, "*unknown-%d*\n", len = snprintf(buf, remaining, "*unknown-%d*\n",
svsk->sk_sk->sk_family); svsk->sk_sk->sk_family);
} }
if (len >= remaining) {
*buf = '\0';
return -ENAMETOOLONG;
}
return len; return len;
} }
@ -282,15 +287,21 @@ int svc_sock_names(struct svc_serv *serv, char *buf, const size_t buflen,
if (!serv) if (!serv)
return 0; return 0;
spin_lock_bh(&serv->sv_lock); spin_lock_bh(&serv->sv_lock);
list_for_each_entry(svsk, &serv->sv_permsocks, sk_xprt.xpt_list) { list_for_each_entry(svsk, &serv->sv_permsocks, sk_xprt.xpt_list) {
int onelen = one_sock_name(buf+len, svsk); int onelen = svc_one_sock_name(svsk, buf + len, buflen - len);
if (toclose && strcmp(toclose, buf+len) == 0) if (onelen < 0) {
len = onelen;
break;
}
if (toclose && strcmp(toclose, buf + len) == 0)
closesk = svsk; closesk = svsk;
else else
len += onelen; len += onelen;
} }
spin_unlock_bh(&serv->sv_lock); spin_unlock_bh(&serv->sv_lock);
if (closesk) if (closesk)
/* Should unregister with portmap, but you cannot /* Should unregister with portmap, but you cannot
* unregister just one protocol... * unregister just one protocol...
@ -1195,7 +1206,7 @@ int svc_addsock(struct svc_serv *serv, const int fd, char *name_return,
sockfd_put(so); sockfd_put(so);
return err; return err;
} }
return one_sock_name(name_return, svsk); return svc_one_sock_name(svsk, name_return, len);
} }
EXPORT_SYMBOL_GPL(svc_addsock); EXPORT_SYMBOL_GPL(svc_addsock);