Loading fs/nfsd/nfs3acl.c +13 −18 Original line number Diff line number Diff line Loading @@ -140,28 +140,23 @@ static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p) static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p) { struct nfsd3_setaclargs *args = rqstp->rq_argp; struct kvec *head = rqstp->rq_arg.head; unsigned int base; int n; struct xdr_stream *xdr = &rqstp->rq_arg_stream; struct nfsd3_setaclargs *argp = rqstp->rq_argp; p = nfs3svc_decode_fh(p, &args->fh); if (!p) if (!svcxdr_decode_nfs_fh3(xdr, &argp->fh)) return 0; if (xdr_stream_decode_u32(xdr, &argp->mask) < 0) return 0; args->mask = ntohl(*p++); if (args->mask & ~NFS_ACL_MASK || !xdr_argsize_check(rqstp, p)) if (argp->mask & ~NFS_ACL_MASK) return 0; if (!nfs_stream_decode_acl(xdr, NULL, (argp->mask & NFS_ACL) ? &argp->acl_access : NULL)) return 0; if (!nfs_stream_decode_acl(xdr, NULL, (argp->mask & NFS_DFACL) ? &argp->acl_default : NULL)) return 0; base = (char *)p - (char *)head->iov_base; n = nfsacl_decode(&rqstp->rq_arg, base, NULL, (args->mask & NFS_ACL) ? &args->acl_access : NULL); if (n > 0) n = nfsacl_decode(&rqstp->rq_arg, base + n, NULL, (args->mask & NFS_DFACL) ? &args->acl_default : NULL); return (n > 0); return 1; } /* Loading Loading
fs/nfsd/nfs3acl.c +13 −18 Original line number Diff line number Diff line Loading @@ -140,28 +140,23 @@ static int nfs3svc_decode_getaclargs(struct svc_rqst *rqstp, __be32 *p) static int nfs3svc_decode_setaclargs(struct svc_rqst *rqstp, __be32 *p) { struct nfsd3_setaclargs *args = rqstp->rq_argp; struct kvec *head = rqstp->rq_arg.head; unsigned int base; int n; struct xdr_stream *xdr = &rqstp->rq_arg_stream; struct nfsd3_setaclargs *argp = rqstp->rq_argp; p = nfs3svc_decode_fh(p, &args->fh); if (!p) if (!svcxdr_decode_nfs_fh3(xdr, &argp->fh)) return 0; if (xdr_stream_decode_u32(xdr, &argp->mask) < 0) return 0; args->mask = ntohl(*p++); if (args->mask & ~NFS_ACL_MASK || !xdr_argsize_check(rqstp, p)) if (argp->mask & ~NFS_ACL_MASK) return 0; if (!nfs_stream_decode_acl(xdr, NULL, (argp->mask & NFS_ACL) ? &argp->acl_access : NULL)) return 0; if (!nfs_stream_decode_acl(xdr, NULL, (argp->mask & NFS_DFACL) ? &argp->acl_default : NULL)) return 0; base = (char *)p - (char *)head->iov_base; n = nfsacl_decode(&rqstp->rq_arg, base, NULL, (args->mask & NFS_ACL) ? &args->acl_access : NULL); if (n > 0) n = nfsacl_decode(&rqstp->rq_arg, base + n, NULL, (args->mask & NFS_DFACL) ? &args->acl_default : NULL); return (n > 0); return 1; } /* Loading