aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2007-07-19 04:47:54 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:43 -0400
commit64ee4808a786caade50362d5057f65314fdf2f36 (patch)
tree8eaed3de1a0cc0aa2e4189e5b3a7ff9505e60dee /fs
parent39ef01e00daf6d860783f1a836f765265a9d3b47 (diff)
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 <mhalcrow@us.ibm.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ecryptfs/inode.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index e77a2ec71aa5..0a50942b4378 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)
902 mutex_lock(&crypt_stat->cs_mutex); 902 mutex_lock(&crypt_stat->cs_mutex);
903 if (S_ISDIR(dentry->d_inode->i_mode)) 903 if (S_ISDIR(dentry->d_inode->i_mode))
904 crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED); 904 crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
905 else if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED) 905 else if (S_ISREG(dentry->d_inode->i_mode)
906 || !(crypt_stat->flags & ECRYPTFS_KEY_VALID)) { 906 && (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
907 || !(crypt_stat->flags & ECRYPTFS_KEY_VALID))) {
907 struct vfsmount *lower_mnt; 908 struct vfsmount *lower_mnt;
908 struct file *lower_file = NULL; 909 struct file *lower_file = NULL;
909 struct ecryptfs_mount_crypt_stat *mount_crypt_stat; 910 struct ecryptfs_mount_crypt_stat *mount_crypt_stat;