nfsd4: fix bad bounds checking
authorJ. Bruce Fields <bfields@redhat.com>
Tue, 1 Mar 2016 01:21:21 +0000 (20:21 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Apr 2016 16:09:03 +0000 (09:09 -0700)
commit9ef1ecc409b1e1113bf5e4b6bdd47137e5f9cebb
tree42905816e696017424c244f76c33e77daa0b9207
parent48f447bcebd889aab7193659841de7962bf52a56
nfsd4: fix bad bounds checking

commit 4aed9c46afb80164401143aa0fdcfe3798baa9d5 upstream.

A number of spots in the xdr decoding follow a pattern like

n = be32_to_cpup(p++);
READ_BUF(n + 4);

where n is a u32.  The only bounds checking is done in READ_BUF itself,
but since it's checking (n + 4), it won't catch cases where n is very
large, (u32)(-4) or higher.  I'm not sure exactly what the consequences
are, but we've seen crashes soon after.

Instead, just break these up into two READ_BUF()s.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfsd/nfs4xdr.c