diff options
| author | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2010-02-11 01:02:32 -0500 |
|---|---|---|
| committer | Tyler Hicks <tyhicks@linux.vnet.ibm.com> | 2010-03-23 13:31:35 -0400 |
| commit | f4e60e6b303bc46cdc477d3174dbf9cb5dd013aa (patch) | |
| tree | 36abefd614efd86f97ac812f57c86a583c7e484a /fs/ecryptfs/mmap.c | |
| parent | 1984c23f9e0cdb432d90a85ecf88b424d36878fc (diff) | |
eCryptfs: Strip metadata in xattr flag in encrypted view
The ecryptfs_encrypted_view mount option provides a unified way of
viewing encrypted eCryptfs files. If the metadata is stored in a xattr,
the metadata is moved to the file header when the file is read inside
the eCryptfs mount. Because of this, we should strip the
ECRYPTFS_METADATA_IN_XATTR flag from the header's flag section. This
allows eCryptfs to treat the file as an eCryptfs file with a header
at the front.
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs/mmap.c')
| -rw-r--r-- | fs/ecryptfs/mmap.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index 270f42ae7c0..bea998a25af 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c | |||
| @@ -82,6 +82,19 @@ out: | |||
| 82 | return rc; | 82 | return rc; |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | static void strip_xattr_flag(char *page_virt, | ||
| 86 | struct ecryptfs_crypt_stat *crypt_stat) | ||
| 87 | { | ||
| 88 | if (crypt_stat->flags & ECRYPTFS_METADATA_IN_XATTR) { | ||
| 89 | size_t written; | ||
| 90 | |||
| 91 | crypt_stat->flags &= ~ECRYPTFS_METADATA_IN_XATTR; | ||
| 92 | ecryptfs_write_crypt_stat_flags(page_virt, crypt_stat, | ||
| 93 | &written); | ||
| 94 | crypt_stat->flags |= ECRYPTFS_METADATA_IN_XATTR; | ||
| 95 | } | ||
| 96 | } | ||
| 97 | |||
| 85 | /** | 98 | /** |
| 86 | * Header Extent: | 99 | * Header Extent: |
| 87 | * Octets 0-7: Unencrypted file size (big-endian) | 100 | * Octets 0-7: Unencrypted file size (big-endian) |
| @@ -136,6 +149,7 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, | |||
| 136 | 149 | ||
| 137 | rc = ecryptfs_read_xattr_region( | 150 | rc = ecryptfs_read_xattr_region( |
| 138 | page_virt, page->mapping->host); | 151 | page_virt, page->mapping->host); |
| 152 | strip_xattr_flag(page_virt + 16, crypt_stat); | ||
| 139 | ecryptfs_write_header_metadata(page_virt + 20, | 153 | ecryptfs_write_header_metadata(page_virt + 20, |
| 140 | crypt_stat, | 154 | crypt_stat, |
| 141 | &written); | 155 | &written); |