[NFSd,SUNRPC] 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: Andreas Gruenbacher Signed-off-by: Trond Myklebust --- nfs/nfs3xdr.c | 2 +- nfsd/nfssvc.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) Index: linux-2.6.12/fs/nfs/nfs3xdr.c =================================================================== --- linux-2.6.12.orig/fs/nfs/nfs3xdr.c +++ linux-2.6.12/fs/nfs/nfs3xdr.c @@ -677,7 +677,7 @@ nfs3_xdr_setaclargs(struct rpc_rqst *req /* 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); Index: linux-2.6.12/fs/nfsd/nfssvc.c =================================================================== --- linux-2.6.12.orig/fs/nfsd/nfssvc.c +++ linux-2.6.12/fs/nfsd/nfssvc.c @@ -378,6 +378,7 @@ static struct svc_program nfsd_acl_progr .pg_nvers = NFSD_ACL_NRVERS, .pg_vers = nfsd_acl_version, .pg_name = "nfsd", + .pg_class = "nfsd", .pg_stats = &nfsd_acl_svcstats, };