diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-14 17:06:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-14 17:06:48 +0800 |
| commit | 1beb6ea36b283c1dc34812c6ef9bf56a1e494f8c (patch) | |
| tree | 539dc6f4b8c68f385a6457ef7b9d15570a0a8dcc /net | |
| parent | 6c1be3bf831c5b1f2ba51425315287df2c350633 (diff) | |
| parent | b5076139991c6b12c62346d9880eec1d4227d99f (diff) | |
Merge tag 'v3.18.35' into linux-linaro-lsk-v3.18
This is the 3.18.35 stable release
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index c548ab213f76..d08f75972c57 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -855,8 +855,8 @@ unwrap_integ_data(struct svc_rqst *rqstp, struct xdr_buf *buf, u32 seq, struct g goto out; if (svc_getnl(&buf->head[0]) != seq) goto out; - /* trim off the mic at the end before returning */ - xdr_buf_trim(buf, mic.len + 4); + /* trim off the mic and padding at the end before returning */ + xdr_buf_trim(buf, round_up_to_quad(mic.len) + 4); stat = 0; out: kfree(mic.data); |