]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
NFSD: Fix READDIR buffer overflow
authorChuck Lever <chuck.lever@oracle.com>
Thu, 16 Dec 2021 16:12:11 +0000 (11:12 -0500)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 4 Jan 2022 08:49:41 +0000 (09:49 +0100)
commit7efb864c25f9275ee3160f25cd00d317644fa52c
tree0ee242fbc9263849755f4236e0c47fda19fe9561
parent6257be030c0c68b3629add10408ab21e34a13fe8
NFSD: Fix READDIR buffer overflow

BugLink: https://bugs.launchpad.net/bugs/1956305
commit 53b1119a6e5028b125f431a0116ba73510d82a72 upstream.

If a client sends a READDIR count argument that is too small (say,
zero), then the buffer size calculation in the new init_dirlist
helper functions results in an underflow, allowing the XDR stream
functions to write beyond the actual buffer.

This calculation has always been suspect. NFSD has never sanity-
checked the READDIR count argument, but the old entry encoders
managed the problem correctly.

With the commits below, entry encoding changed, exposing the
underflow to the pointer arithmetic in xdr_reserve_space().

Modern NFS clients attempt to retrieve as much data as possible
for each READDIR request. Also, we have no unit tests that
exercise the behavior of READDIR at the lower bound of @count
values. Thus this case was missed during testing.

Reported-by: Anatoly Trosinenko <anatoly.trosinenko@gmail.com>
Fixes: f5dcccd647da ("NFSD: Update the NFSv2 READDIR entry encoder to use struct xdr_stream")
Fixes: 7f87fc2d34d4 ("NFSD: Update NFSv3 READDIR entry encoders to use struct xdr_stream")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
fs/nfsd/nfs3proc.c
fs/nfsd/nfsproc.c