Skip to content

Commit bd1bfe4

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6: eCryptfs: Remove ecryptfs_header_cache_2 eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose() eCryptfs: Return useful code from contains_ecryptfs_marker eCryptfs: Fix new inode race condition eCryptfs: Cleanup inode initialization code eCryptfs: Consolidate inode functions into inode.c
2 parents cd1acdf + 3063287 commit bd1bfe4

File tree

6 files changed

+220
-263
lines changed

6 files changed

+220
-263
lines changed

‎fs/ecryptfs/crypto.c

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,25 +1024,25 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry)
10241024
}
10251025

10261026
/**
1027-
* contains_ecryptfs_marker - check for the ecryptfs marker
1027+
* ecryptfs_validate_marker - check for the ecryptfs marker
10281028
* @data: The data block in which to check
10291029
*
1030-
* Returns one if marker found; zero if not found
1030+
* Returns zero if marker found; -EINVAL if not found
10311031
*/
1032-
static int contains_ecryptfs_marker(char *data)
1032+
static int ecryptfs_validate_marker(char *data)
10331033
{
10341034
u32 m_1, m_2;
10351035

10361036
m_1 = get_unaligned_be32(data);
10371037
m_2 = get_unaligned_be32(data + 4);
10381038
if ((m_1 ^ MAGIC_ECRYPTFS_MARKER) == m_2)
1039-
return 1;
1039+
return 0;
10401040
ecryptfs_printk(KERN_DEBUG, "m_1 = [0x%.8x]; m_2 = [0x%.8x]; "
10411041
"MAGIC_ECRYPTFS_MARKER = [0x%.8x]\n", m_1, m_2,
10421042
MAGIC_ECRYPTFS_MARKER);
10431043
ecryptfs_printk(KERN_DEBUG, "(m_1 ^ MAGIC_ECRYPTFS_MARKER) = "
10441044
"[0x%.8x]\n", (m_1 ^ MAGIC_ECRYPTFS_MARKER));
1045-
return 0;
1045+
return -EINVAL;
10461046
}
10471047

10481048
struct ecryptfs_flag_map_elem {
@@ -1201,27 +1201,19 @@ int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code)
12011201
return rc;
12021202
}
12031203

1204-
int ecryptfs_read_and_validate_header_region(char *data,
1205-
struct inode *ecryptfs_inode)
1204+
int ecryptfs_read_and_validate_header_region(struct inode *inode)
12061205
{
1207-
struct ecryptfs_crypt_stat *crypt_stat =
1208-
&(ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat);
1206+
u8 file_size[ECRYPTFS_SIZE_AND_MARKER_BYTES];
1207+
u8 *marker = file_size + ECRYPTFS_FILE_SIZE_BYTES;
12091208
int rc;
12101209

1211-
if (crypt_stat->extent_size == 0)
1212-
crypt_stat->extent_size = ECRYPTFS_DEFAULT_EXTENT_SIZE;
1213-
rc = ecryptfs_read_lower(data, 0, crypt_stat->extent_size,
1214-
ecryptfs_inode);
1215-
if (rc < 0) {
1216-
printk(KERN_ERR "%s: Error reading header region; rc = [%d]\n",
1217-
__func__, rc);
1218-
goto out;
1219-
}
1220-
if (!contains_ecryptfs_marker(data + ECRYPTFS_FILE_SIZE_BYTES)) {
1221-
rc = -EINVAL;
1222-
} else
1223-
rc = 0;
1224-
out:
1210+
rc = ecryptfs_read_lower(file_size, 0, ECRYPTFS_SIZE_AND_MARKER_BYTES,
1211+
inode);
1212+
if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)
1213+
return rc >= 0 ? -EINVAL : rc;
1214+
rc = ecryptfs_validate_marker(marker);
1215+
if (!rc)
1216+
ecryptfs_i_size_init(file_size, inode);
12251217
return rc;
12261218
}
12271219

@@ -1242,8 +1234,7 @@ ecryptfs_write_header_metadata(char *virt,
12421234
(*written) = 6;
12431235
}
12441236

1245-
struct kmem_cache *ecryptfs_header_cache_1;
1246-
struct kmem_cache *ecryptfs_header_cache_2;
1237+
struct kmem_cache *ecryptfs_header_cache;
12471238

12481239
/**
12491240
* ecryptfs_write_headers_virt
@@ -1496,11 +1487,9 @@ static int ecryptfs_read_headers_virt(char *page_virt,
14961487
crypt_stat->mount_crypt_stat = &ecryptfs_superblock_to_private(
14971488
ecryptfs_dentry->d_sb)->mount_crypt_stat;
14981489
offset = ECRYPTFS_FILE_SIZE_BYTES;
1499-
rc = contains_ecryptfs_marker(page_virt + offset);
1500-
if (rc == 0) {
1501-
rc = -EINVAL;
1490+
rc = ecryptfs_validate_marker(page_virt + offset);
1491+
if (rc)
15021492
goto out;
1503-
}
15041493
if (!(crypt_stat->flags & ECRYPTFS_I_SIZE_INITIALIZED))
15051494
ecryptfs_i_size_init(page_virt, ecryptfs_dentry->d_inode);
15061495
offset += MAGIC_ECRYPTFS_MARKER_SIZE_BYTES;
@@ -1567,20 +1556,21 @@ int ecryptfs_read_xattr_region(char *page_virt, struct inode *ecryptfs_inode)
15671556
return rc;
15681557
}
15691558

1570-
int ecryptfs_read_and_validate_xattr_region(char *page_virt,
1571-
struct dentry *ecryptfs_dentry)
1559+
int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry,
1560+
struct inode *inode)
15721561
{
1562+
u8 file_size[ECRYPTFS_SIZE_AND_MARKER_BYTES];
1563+
u8 *marker = file_size + ECRYPTFS_FILE_SIZE_BYTES;
15731564
int rc;
15741565

1575-
rc = ecryptfs_read_xattr_region(page_virt, ecryptfs_dentry->d_inode);
1576-
if (rc)
1577-
goto out;
1578-
if (!contains_ecryptfs_marker(page_virt + ECRYPTFS_FILE_SIZE_BYTES)) {
1579-
printk(KERN_WARNING "Valid data found in [%s] xattr, but "
1580-
"the marker is invalid\n", ECRYPTFS_XATTR_NAME);
1581-
rc = -EINVAL;
1582-
}
1583-
out:
1566+
rc = ecryptfs_getxattr_lower(ecryptfs_dentry_to_lower(dentry),
1567+
ECRYPTFS_XATTR_NAME, file_size,
1568+
ECRYPTFS_SIZE_AND_MARKER_BYTES);
1569+
if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)
1570+
return rc >= 0 ? -EINVAL : rc;
1571+
rc = ecryptfs_validate_marker(marker);
1572+
if (!rc)
1573+
ecryptfs_i_size_init(file_size, inode);
15841574
return rc;
15851575
}
15861576

@@ -1610,7 +1600,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
16101600
ecryptfs_copy_mount_wide_flags_to_inode_flags(crypt_stat,
16111601
mount_crypt_stat);
16121602
/* Read the first page from the underlying file */
1613-
page_virt = kmem_cache_alloc(ecryptfs_header_cache_1, GFP_USER);
1603+
page_virt = kmem_cache_alloc(ecryptfs_header_cache, GFP_USER);
16141604
if (!page_virt) {
16151605
rc = -ENOMEM;
16161606
printk(KERN_ERR "%s: Unable to allocate page_virt\n",
@@ -1655,7 +1645,7 @@ int ecryptfs_read_metadata(struct dentry *ecryptfs_dentry)
16551645
out:
16561646
if (page_virt) {
16571647
memset(page_virt, 0, PAGE_CACHE_SIZE);
1658-
kmem_cache_free(ecryptfs_header_cache_1, page_virt);
1648+
kmem_cache_free(ecryptfs_header_cache, page_virt);
16591649
}
16601650
return rc;
16611651
}

‎fs/ecryptfs/ecryptfs_kernel.h

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@ ecryptfs_get_key_payload_data(struct key *key)
200200
#define MAGIC_ECRYPTFS_MARKER 0x3c81b7f5
201201
#define MAGIC_ECRYPTFS_MARKER_SIZE_BYTES 8 /* 4*2 */
202202
#define ECRYPTFS_FILE_SIZE_BYTES (sizeof(u64))
203+
#define ECRYPTFS_SIZE_AND_MARKER_BYTES (ECRYPTFS_FILE_SIZE_BYTES \
204+
+ MAGIC_ECRYPTFS_MARKER_SIZE_BYTES)
203205
#define ECRYPTFS_DEFAULT_CIPHER "aes"
204206
#define ECRYPTFS_DEFAULT_KEY_BYTES 16
205207
#define ECRYPTFS_DEFAULT_HASH "md5"
@@ -603,8 +605,7 @@ extern struct kmem_cache *ecryptfs_file_info_cache;
603605
extern struct kmem_cache *ecryptfs_dentry_info_cache;
604606
extern struct kmem_cache *ecryptfs_inode_info_cache;
605607
extern struct kmem_cache *ecryptfs_sb_info_cache;
606-
extern struct kmem_cache *ecryptfs_header_cache_1;
607-
extern struct kmem_cache *ecryptfs_header_cache_2;
608+
extern struct kmem_cache *ecryptfs_header_cache;
608609
extern struct kmem_cache *ecryptfs_xattr_cache;
609610
extern struct kmem_cache *ecryptfs_key_record_cache;
610611
extern struct kmem_cache *ecryptfs_key_sig_cache;
@@ -625,14 +626,9 @@ struct ecryptfs_open_req {
625626
struct list_head kthread_ctl_list;
626627
};
627628

628-
#define ECRYPTFS_INTERPOSE_FLAG_D_ADD 0x00000001
629-
int ecryptfs_interpose(struct dentry *hidden_dentry,
630-
struct dentry *this_dentry, struct super_block *sb,
631-
u32 flags);
629+
struct inode *ecryptfs_get_inode(struct inode *lower_inode,
630+
struct super_block *sb);
632631
void ecryptfs_i_size_init(const char *page_virt, struct inode *inode);
633-
int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry,
634-
struct dentry *lower_dentry,
635-
struct inode *ecryptfs_dir_inode);
636632
int ecryptfs_decode_and_decrypt_filename(char **decrypted_name,
637633
size_t *decrypted_name_size,
638634
struct dentry *ecryptfs_dentry,
@@ -664,10 +660,9 @@ int ecryptfs_new_file_context(struct dentry *ecryptfs_dentry);
664660
void ecryptfs_write_crypt_stat_flags(char *page_virt,
665661
struct ecryptfs_crypt_stat *crypt_stat,
666662
size_t *written);
667-
int ecryptfs_read_and_validate_header_region(char *data,
668-
struct inode *ecryptfs_inode);
669-
int ecryptfs_read_and_validate_xattr_region(char *page_virt,
670-
struct dentry *ecryptfs_dentry);
663+
int ecryptfs_read_and_validate_header_region(struct inode *inode);
664+
int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry,
665+
struct inode *inode);
671666
u8 ecryptfs_code_for_cipher_string(char *cipher_name, size_t key_bytes);
672667
int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code);
673668
void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat);
@@ -679,9 +674,6 @@ int
679674
ecryptfs_parse_packet_set(struct ecryptfs_crypt_stat *crypt_stat,
680675
unsigned char *src, struct dentry *ecryptfs_dentry);
681676
int ecryptfs_truncate(struct dentry *dentry, loff_t new_length);
682-
int ecryptfs_inode_test(struct inode *inode, void *candidate_lower_inode);
683-
int ecryptfs_inode_set(struct inode *inode, void *lower_inode);
684-
void ecryptfs_init_inode(struct inode *inode, struct inode *lower_inode);
685677
ssize_t
686678
ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name,
687679
void *value, size_t size);
@@ -761,7 +753,7 @@ int ecryptfs_privileged_open(struct file **lower_file,
761753
struct dentry *lower_dentry,
762754
struct vfsmount *lower_mnt,
763755
const struct cred *cred);
764-
int ecryptfs_get_lower_file(struct dentry *ecryptfs_dentry);
756+
int ecryptfs_get_lower_file(struct dentry *dentry, struct inode *inode);
765757
void ecryptfs_put_lower_file(struct inode *inode);
766758
int
767759
ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,

‎fs/ecryptfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
191191
| ECRYPTFS_ENCRYPTED);
192192
}
193193
mutex_unlock(&crypt_stat->cs_mutex);
194-
rc = ecryptfs_get_lower_file(ecryptfs_dentry);
194+
rc = ecryptfs_get_lower_file(ecryptfs_dentry, inode);
195195
if (rc) {
196196
printk(KERN_ERR "%s: Error attempting to initialize "
197197
"the lower file for the dentry with name "

0 commit comments

Comments
 (0)