X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Ffile_table.c;h=32d12b78bac8e2c05a80dc53386b355bdc10ef73;hb=a3cba2aad9c0a63279716d377efbf37c176ed400;hp=69652c5bd5f0ad83b983324d4dc2d31b7a1cd689;hpb=385e3ed4f0b81dd0b0b214050a30d352a71b95f7;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/file_table.c b/fs/file_table.c
index 69652c5..32d12b7 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -253,6 +253,7 @@ void __fput(struct file *file)
 	if (file->f_op && file->f_op->release)
 		file->f_op->release(inode, file);
 	security_file_free(file);
+	ima_file_free(file);
 	if (unlikely(S_ISCHR(inode->i_mode) && inode->i_cdev != NULL))
 		cdev_put(inode->i_cdev);
 	fops_put(file->f_op);
@@ -392,7 +393,9 @@ retry:
 			continue;
 		if (!(f->f_mode & FMODE_WRITE))
 			continue;
+		spin_lock(&f->f_lock);
 		f->f_mode &= ~FMODE_WRITE;
+		spin_unlock(&f->f_lock);
 		if (file_check_writeable(f) != 0)
 			continue;
 		file_release_write(f);