diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-26 00:01:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-26 00:01:00 +0100 |
| commit | 535ad2c06cf12f3f075e3d9a141476beb367ae6b (patch) | |
| tree | 7ab4365d17bf07bd636177fb1c485a1ba899c5ea /net/sunrpc | |
| parent | 9f6772da061814c2962aeb7d79231f7510dba313 (diff) | |
| parent | 04e780d9cc5d55b07286a5ecbc455c027a81ab7f (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/svcauth_unix.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/svcsock.c | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index 06bdf5a1082c..1583c8a4eb7f 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/net/sunrpc/svcauth_unix.c @@ -493,8 +493,6 @@ static int unix_gid_parse(struct cache_detail *cd, if (rv) return -EINVAL; uid = make_kuid(&init_user_ns, id); - if (!uid_valid(uid)) - return -EINVAL; ug.uid = uid; expiry = get_expiry(&mesg); diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 0f679df7d072..305374d4fb98 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -917,7 +917,10 @@ static void svc_tcp_clear_pages(struct svc_sock *svsk) len = svsk->sk_datalen; npages = (len + PAGE_SIZE - 1) >> PAGE_SHIFT; for (i = 0; i < npages; i++) { - BUG_ON(svsk->sk_pages[i] == NULL); + if (svsk->sk_pages[i] == NULL) { + WARN_ON_ONCE(1); + continue; + } put_page(svsk->sk_pages[i]); svsk->sk_pages[i] = NULL; } @@ -1092,8 +1095,10 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) goto err_noclose; } - if (svc_sock_reclen(svsk) < 8) + if (svsk->sk_datalen < 8) { + svsk->sk_datalen = 0; goto err_delete; /* client is nuts. */ + } rqstp->rq_arg.len = svsk->sk_datalen; rqstp->rq_arg.page_base = 0; |