Commit:     aefa89d178e6dd83889b66d4e800d4d77363900b
Parent:     63c86716ea34ad94d52e5b0abbda152574dc42b5
Author:     Prasad P <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 24 15:14:32 2007 -0500
Committer:  J. Bruce Fields <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 16:42:01 2008 -0500

    nfsd: Fix inconsistent assignment
    Dereferenced pointer "dentry" without checking and assigned to inode
    in the declaration.
    (We could just delete the NULL checks that follow instead, as we never
    get to the encode function in this particular case.  But it takes a
    little detective work to verify that fact, so it's probably safer to
    leave the checks in place.)
    Cc: Steve French <[EMAIL PROTECTED]>
    Signed-off-by: Prasad V Potluri <[EMAIL PROTECTED]>
    Signed-off-by: J. Bruce Fields <[EMAIL PROTECTED]>
 fs/nfsd/nfs2acl.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index 0e5fa11..1c3b765 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -221,12 +221,17 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst 
*rqstp, __be32 *p,
                struct nfsd3_getaclres *resp)
        struct dentry *dentry = resp->fh.fh_dentry;
-       struct inode *inode = dentry->d_inode;
+       struct inode *inode;
        struct kvec *head = rqstp->rq_res.head;
        unsigned int base;
        int n;
        int w;
+       /*
+        * Since this is version 2, the check for nfserr in
+        * nfsd_dispatch actually ensures the following cannot happen.
+        * However, it seems fragile to depend on that.
+        */
        if (dentry == NULL || dentry->d_inode == NULL)
                return 0;
        inode = dentry->d_inode;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to