mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 17:12:06 +00:00
ba3ff12fca
Trevor found a file size problem in eCryptfs in recent kernels, and he
tracked it down to an fsstack change.
This was the eCryptfs copy_attr_all:
> -void ecryptfs_copy_attr_all(struct inode *dest, const struct inode *src)
> -{
> - dest->i_mode = src->i_mode;
> - dest->i_nlink = src->i_nlink;
> - dest->i_uid = src->i_uid;
> - dest->i_gid = src->i_gid;
> - dest->i_rdev = src->i_rdev;
> - dest->i_atime = src->i_atime;
> - dest->i_mtime = src->i_mtime;
> - dest->i_ctime = src->i_ctime;
> - dest->i_blkbits = src->i_blkbits;
> - dest->i_flags = src->i_flags;
> -}
This is the fsstack copy_attr_all:
> +void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
> + int (*get_nlinks)(struct inode *))
> +{
> + if (!get_nlinks)
> + dest->i_nlink = src->i_nlink;
> + else
> + dest->i_nlink = (*get_nlinks)(dest);
> +
> + dest->i_mode = src->i_mode;
> + dest->i_uid = src->i_uid;
> + dest->i_gid = src->i_gid;
> + dest->i_rdev = src->i_rdev;
> + dest->i_atime = src->i_atime;
> + dest->i_mtime = src->i_mtime;
> + dest->i_ctime = src->i_ctime;
> + dest->i_blkbits = src->i_blkbits;
> + dest->i_flags = src->i_flags;
> +
> + fsstack_copy_inode_size(dest, src);
> +}
The addition of copy_inode_size breaks eCryptfs, since eCryptfs needs to
interpolate the file sizes (eCryptfs has extra space in the lower file for
the header). The setting of the upper inode size occurs elsewhere in
eCryptfs, and the new copy_attr_all now undoes what eCryptfs was doing
right beforehand.
I see three ways of going forward from here. (1) Something like this patch
needs to go in (assuming it jives with Unionfs), (2) we need to make a
change to the fsstack API for more fine-grained control over copying
attributes (e.g., by also including a callback function for calculating the
right file size, which will require some more work on both eCryptfs and
Unionfs), or (3) the fsstack patch on eCryptfs (commit
0cc72dc7f0 made on Fri Dec 8 02:36:31 2006
-0800) needs to be yanked in 2.6.20.
I think the simplest solution, from eCryptfs' perspective, is to just
remove the inode size copy.
Remove inode size copy in general fsstack attr copy code. Stacked
filesystems may need to interpolate the inode size, since the file
size in the lower file may be different than the file size in the
stacked layer.
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Acked-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
39 lines
1.0 KiB
C
39 lines
1.0 KiB
C
#include <linux/module.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/fs_stack.h>
|
|
|
|
/* does _NOT_ require i_mutex to be held.
|
|
*
|
|
* This function cannot be inlined since i_size_{read,write} is rather
|
|
* heavy-weight on 32-bit systems
|
|
*/
|
|
void fsstack_copy_inode_size(struct inode *dst, const struct inode *src)
|
|
{
|
|
i_size_write(dst, i_size_read((struct inode *)src));
|
|
dst->i_blocks = src->i_blocks;
|
|
}
|
|
EXPORT_SYMBOL_GPL(fsstack_copy_inode_size);
|
|
|
|
/* copy all attributes; get_nlinks is optional way to override the i_nlink
|
|
* copying
|
|
*/
|
|
void fsstack_copy_attr_all(struct inode *dest, const struct inode *src,
|
|
int (*get_nlinks)(struct inode *))
|
|
{
|
|
if (!get_nlinks)
|
|
dest->i_nlink = src->i_nlink;
|
|
else
|
|
dest->i_nlink = (*get_nlinks)(dest);
|
|
|
|
dest->i_mode = src->i_mode;
|
|
dest->i_uid = src->i_uid;
|
|
dest->i_gid = src->i_gid;
|
|
dest->i_rdev = src->i_rdev;
|
|
dest->i_atime = src->i_atime;
|
|
dest->i_mtime = src->i_mtime;
|
|
dest->i_ctime = src->i_ctime;
|
|
dest->i_blkbits = src->i_blkbits;
|
|
dest->i_flags = src->i_flags;
|
|
}
|
|
EXPORT_SYMBOL_GPL(fsstack_copy_attr_all);
|