From: Kinglong Mee <kinglongmee@gmail.com>
Date: Sun, 5 Feb 2017 01:57:37 +0000 (+0800)
Subject: nfsd/callback: skip the callback tag
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~8306^2~13
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e86a40bc7331b7b93a88edd74e6b2f738107a6f9;p=mirror_ubuntu-focal-kernel.git

nfsd/callback: skip the callback tag

The callback tag is NULL, and hdr->nops is unused too right now, but.
But if we were to ever test with a nonzero callback tag, nops will get a
bad value.

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index fb6ca0ace9b1..ea74149841e7 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -303,6 +303,7 @@ static int decode_cb_compound4res(struct xdr_stream *xdr,
 	p = xdr_inline_decode(xdr, length + 4);
 	if (unlikely(p == NULL))
 		goto out_overflow;
+	p += XDR_QUADLEN(length);
 	hdr->nops = be32_to_cpup(p);
 	return 0;
 out_overflow: