Re: [PATCH 065/190] Revert "nfsd: remove unnecessary assertion in nfsd4_encode_replay"

J. Bruce Fields
2021-04-21T14:33:12Z

This patch was fine, NAK to the revert.

--b.

On Wed, Apr 21, 2021 at 02:59:00PM +0200, Greg Kroah-Hartman wrote:
> This reverts commit fc1b20659597015a30e8ea032f168e97848c1d39.
>
> Commits from @umn.edu addresses have been found to be submitted in "bad
> faith" to try to test the kernel community's ability to review "known
> malicious" changes. The result of these submissions can be found in a
> paper published at the 42nd IEEE Symposium on Security and Privacy
> entitled, "Open Source Insecurity: Stealthily Introducing
> Vulnerabilities via Hypocrite Commits" written by Qiushi Wu (University
> of Minnesota) and Kangjie Lu (University of Minnesota).
>
> Because of this, all submissions from this group must be reverted from
> the kernel tree and will need to be re-reviewed again to determine if
> they actually are a valid fix. Until that work is complete, remove this
> change to ensure that no problems are being introduced into the
> codebase.
>
> Cc: Aditya Pakki <pakki001@umn.edu>
> Cc: J. Bruce Fields <bfields@redhat.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> fs/nfsd/nfs4xdr.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index eaaa1605b5b5..a3609562671c 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -5385,6 +5385,8 @@ nfsd4_encode_replay(struct xdr_stream *xdr, struct nfsd4_op *op)
> __be32 *p;
> struct nfs4_replay *rp = op->replay;
>
> + BUG_ON(!rp);
> +
> p = xdr_reserve_space(xdr, 8 + rp->rp_buflen);
> if (!p) {
> WARN_ON_ONCE(1);
> --
> 2.31.1
>