Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 463a376e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Buffer overflow in ->decode_dirent() should not be fatal 



Overflowing the buffer in the readdir ->decode_dirent() should not lead to
a fatal error, but rather to an attempt to reread the record in question.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b47d19de

fs/nfs/nfs2xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ nfs_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, struct nfs_se 


out_overflow:

	print_overflow_msg(__func__, xdr);

	return ERR_PTR(-EIO);

	return ERR_PTR(-EAGAIN);

}



/*

fs/nfs/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ nfs3_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, struct nfs_s 
out_overflow:

	print_overflow_msg(__func__, xdr);

out_overflow_exit:

	return ERR_PTR(-EIO);

	return ERR_PTR(-EAGAIN);

}



/*

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -6221,7 +6221,7 @@ __be32 *nfs4_decode_dirent(struct xdr_stream *xdr, struct nfs_entry *entry, 


out_overflow:

	print_overflow_msg(__func__, xdr);

	return ERR_PTR(-EIO);

	return ERR_PTR(-EAGAIN);

}



/*