Commit:     64ee4808a786caade50362d5057f65314fdf2f36
Parent:     39ef01e00daf6d860783f1a836f765265a9d3b47
Author:     Michael Halcrow <[EMAIL PROTECTED]>
AuthorDate: Thu Jul 19 01:47:54 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Jul 19 10:04:43 2007 -0700

    eCryptfs: ecryptfs_setattr() bugfix
    There is another bug recently introduced into the ecryptfs_setattr()
    function in 2.6.22.  eCryptfs will attempt to treat special files like
    regular eCryptfs files on chmod, chown, and so forth.  This leads to a NULL
    pointer dereference.  This patch validates that the file is a regular file
    before proceeding with operations related to the inode's crypt_stat.
    Thanks to Ryusuke Konishi for finding this bug and suggesting the fix.
    Signed-off-by: Michael Halcrow <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 fs/ecryptfs/inode.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index e77a2ec..0a50942 100644
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
@@ -902,8 +902,9 @@ static int ecryptfs_setattr(struct dentry *dentry, struct 
iattr *ia)
        if (S_ISDIR(dentry->d_inode->i_mode))
                crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
-       else if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
-                || !(crypt_stat->flags & ECRYPTFS_KEY_VALID)) {
+       else if (S_ISREG(dentry->d_inode->i_mode)
+                && (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
+                    || !(crypt_stat->flags & ECRYPTFS_KEY_VALID))) {
                struct vfsmount *lower_mnt;
                struct file *lower_file = NULL;
                struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
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