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

Commit 21348425 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Trond Myklebust
Browse files

[PATCH] fix nfsacl pointer arithmetic and pg_class initialization bugs 



* Pointer arithmetic bug: p is in word units. This fixes a memory
  corruption with big acls.
* Initialize pg_class to prevent a NULL pointer access.

 Signed-off-by: default avatarAndreas Gruenbacher <agruen@suse.de>
 Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 458818ed

fs/nfs/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ nfs3_xdr_setaclargs(struct rpc_rqst *req, u32 *p, 
	/* put as much of the acls into head as possible. */

	len_in_head = min_t(unsigned int, buf->head->iov_len - base, len);

	len -= len_in_head;

	req->rq_slen = xdr_adjust_iovec(req->rq_svec, p + len_in_head);

	req->rq_slen = xdr_adjust_iovec(req->rq_svec, p + (len_in_head >> 2));



	for (count = 0; (count << PAGE_SHIFT) < len; count++) {

		args->pages[count] = alloc_page(GFP_KERNEL);

fs/nfsd/nfssvc.c

+1 −0
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ static struct svc_program nfsd_acl_program = { 
	.pg_nvers		= NFSD_ACL_NRVERS,

	.pg_vers		= nfsd_acl_version,

	.pg_name		= "nfsd",

	.pg_class		= "nfsd",

	.pg_stats		= &nfsd_acl_svcstats,

};