]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
nfsd: fix corrupted reply to badly ordered compound
authorJ. Bruce Fields <bfields@redhat.com>
Wed, 13 Jun 2018 19:21:35 +0000 (15:21 -0400)
committerJuerg Haefliger <juergh@canonical.com>
Wed, 24 Jul 2019 01:51:08 +0000 (19:51 -0600)
BugLink: https://bugs.launchpad.net/bugs/1836287
[ Upstream commit 5b7b15aee641904ae269be9846610a3950cbd64c ]

We're encoding a single op in the reply but leaving the number of ops
zero, so the reply makes no sense.

Somewhat academic as this isn't a case any real client will hit, though
in theory perhaps that could change in a future protocol extension.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
fs/nfsd/nfs4proc.c

index d24bd86c126810d1c2e2634d187c0a3fe910337d..66b8e8d718e09bb066aafb3ab4b3eb23b033c1e3 100644 (file)
@@ -1719,6 +1719,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)
        if (status) {
                op = &args->ops[0];
                op->status = status;
+               resp->opcnt = 1;
                goto encode_op;
        }