The patch titled
ecryptfs: fix premature release of file_info memory
has been removed from the -mm tree. Its filename is
ecryptfs-file-operations-fix-premature-release-of-file_info-memory.patch
This patch was dropped because it was folded into ecryptfs-file-operations.patch
------------------------------------------------------
Subject: ecryptfs: fix premature release of file_info memory
From: Michael Halcrow <mhalcrow@xxxxxxxxxx>
The file_info struct is being released, and then one of its members is
referenced from the released memory. This patch cleans up the function and
moves the release so that it occurs after the reference.
Signed-off-by: Michael Halcrow <mhalcrow@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/ecryptfs/file.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff -puN fs/ecryptfs/file.c~ecryptfs-file-operations-fix-premature-release-of-file_info-memory fs/ecryptfs/file.c
--- devel/fs/ecryptfs/file.c~ecryptfs-file-operations-fix-premature-release-of-file_info-memory 2006-05-30 17:48:13.000000000 -0700
+++ devel-akpm/fs/ecryptfs/file.c 2006-05-30 17:48:13.000000000 -0700
@@ -304,18 +304,15 @@ static int ecryptfs_flush(struct file *f
return rc;
}
-static int ecryptfs_release(struct inode *ecryptfs_inode, struct file *file)
+static int ecryptfs_release(struct inode *inode, struct file *file)
{
- struct file *lower_file;
- struct ecryptfs_file_info *file_info;
- struct inode *lower_inode;
+ struct file *lower_file = ecryptfs_file_to_lower(file);
+ struct ecryptfs_file_info *file_info = ecryptfs_file_to_private(file);
+ struct inode *lower_inode = ecryptfs_inode_to_lower(inode);
- file_info = ecryptfs_file_to_private(file);
- kmem_cache_free(ecryptfs_file_info_cache, file_info);
- lower_file = ecryptfs_file_to_lower(file);
fput(lower_file);
- lower_inode = ecryptfs_inode_to_lower(ecryptfs_inode);
- ecryptfs_inode->i_blocks = lower_inode->i_blocks;
+ inode->i_blocks = lower_inode->i_blocks;
+ kmem_cache_free(ecryptfs_file_info_cache, file_info);
return 0;
}
_
Patches currently in -mm which might be from mhalcrow@xxxxxxxxxx are
ecryptfs-fs-makefile-and-fs-kconfig.patch
ecryptfs-documentation.patch
ecryptfs-makefile.patch
ecryptfs-main-module-functions.patch
ecryptfs-header-declarations.patch
ecryptfs-superblock-operations.patch
ecryptfs-dentry-operations.patch
ecryptfs-file-operations.patch
ecryptfs-file-operations-fix-premature-release-of-file_info-memory.patch
ecryptfs-inode-operations.patch
ecryptfs-mmap-operations.patch
mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch
ecryptfs-keystore.patch
ecryptfs-crypto-functions.patch
ecryptfs-crypto-functions-fix-filesize-on-hard-link-creation.patch
fs-ecryptfs-possible-cleanups.patch
ecryptfs-debug-functions.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-convert-assert-to-bug_on.patch
ecryptfs-remove-pointless-bug_ons.patch
ecryptfs-remove-unnecessary-null-checks.patch
ecryptfs-rewrite-ecryptfs_fsync.patch
ecryptfs-overhaul-file-locking.patch
ecryptfs-dont-muck-with-the-existing-nameidata-structures.patch
ecryptfs-asm-scatterlisth-linux-scatterlisth.patch
ecryptfs-support-for-larger-maximum-key-size.patch
ecryptfs-add-codes-for-additional-ciphers.patch
ecryptfs-unencrypted-key-size-based-on-encrypted-key-size.patch
ecryptfs-packet-and-key-management-update-for-variable-key-size.patch
ecryptfs-add-ecryptfs_-prefix-to-mount-options-key-size-parameter.patch
ecryptfs-set-the-key-size-from-the-default-for-the-mount.patch
ecryptfs-check-for-weak-keys.patch
ecryptfs-add-define-values-for-cipher-codes-from-rfc2440-openpgp.patch
ecryptfs-convert-bits-to-bytes.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch
ecryptfs-more-intelligent-use-of-tfm-objects.patch
ecryptfs-remove-debugging-cruft.patch
ecryptfs-get_sb_dev-fix.patch
ecryptfs-validate-minimum-header-extent-size.patch
ecryptfs-validate-body-size.patch
ecryptfs-validate-packet-length-prior-to-parsing-add-comments.patch
ecryptfs-validate-packet-length-prior-to-parsing-add-comments-fix.patch
ecryptfs-use-the-passed-in-max-value-as-the-upper-bound.patch
ecryptfs-change-the-maximum-size-check-when-writing-header.patch
ecryptfs-print-the-actual-option-that-is-problematic.patch
ecryptfs-add-a-maintainers-entry.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
