korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-28 22:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

eCryptfs: Return useful code from contains_ecryptfs_marker

Browse Source 
Instead of having the calling functions translate the true/false return
code to either 0 or -EINVAL, have contains_ecryptfs_marker() return 0 or
-EINVAL so that the calling functions can just reuse the return code.

Also, rename the function to ecryptfs_validate_marker() to avoid callers
mistakenly thinking that it returns true/false codes.

Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
This commit is contained in:
Tyler Hicks 2011-05-02 00:39:54 -05:00
parent 3b06b3ebf4
commit 7a86617e55
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/ecryptfs/crypto.c
View File

@ -1024,25 +1024,25 @@ out:
} }
/** /**
* contains_ecryptfs_marker - check for the ecryptfs marker * ecryptfs_validate_marker - check for the ecryptfs marker
* @data: The data block in which to check * @data: The data block in which to check
* *
* Returns one if marker found; zero if not found * Returns zero if marker found; -EINVAL if not found
*/ */
static int contains_ecryptfs_marker(char *data) static int ecryptfs_validate_marker(char *data)
{ {
u32 m_1, m_2; u32 m_1, m_2;
m_1 = get_unaligned_be32(data); m_1 = get_unaligned_be32(data);
m_2 = get_unaligned_be32(data + 4); m_2 = get_unaligned_be32(data + 4);
if ((m_1 ^ MAGIC_ECRYPTFS_MARKER) == m_2) if ((m_1 ^ MAGIC_ECRYPTFS_MARKER) == m_2)
return 1; return 0;
ecryptfs_printk(KERN_DEBUG, "m_1 = [0x%.8x]; m_2 = [0x%.8x]; " ecryptfs_printk(KERN_DEBUG, "m_1 = [0x%.8x]; m_2 = [0x%.8x]; "
"MAGIC_ECRYPTFS_MARKER = [0x%.8x]\n", m_1, m_2, "MAGIC_ECRYPTFS_MARKER = [0x%.8x]\n", m_1, m_2,
MAGIC_ECRYPTFS_MARKER); MAGIC_ECRYPTFS_MARKER);
ecryptfs_printk(KERN_DEBUG, "(m_1 ^ MAGIC_ECRYPTFS_MARKER) = " ecryptfs_printk(KERN_DEBUG, "(m_1 ^ MAGIC_ECRYPTFS_MARKER) = "
"[0x%.8x]\n", (m_1 ^ MAGIC_ECRYPTFS_MARKER)); "[0x%.8x]\n", (m_1 ^ MAGIC_ECRYPTFS_MARKER));
return 0; return -EINVAL;
} }
struct ecryptfs_flag_map_elem { struct ecryptfs_flag_map_elem {
@ -1217,10 +1217,7 @@ int ecryptfs_read_and_validate_header_region(char *data,
__func__, rc); __func__, rc);
goto out; goto out;
} }
if (!contains_ecryptfs_marker(data + ECRYPTFS_FILE_SIZE_BYTES)) { rc = ecryptfs_validate_marker(data + ECRYPTFS_FILE_SIZE_BYTES);
rc = -EINVAL;
} else
rc = 0;
out: out:
return rc; return rc;
} }
@ -1496,11 +1493,9 @@ static int ecryptfs_read_headers_virt(char *page_virt,
crypt_stat->mount_crypt_stat = &ecryptfs_superblock_to_private( crypt_stat->mount_crypt_stat = &ecryptfs_superblock_to_private(
ecryptfs_dentry->d_sb)->mount_crypt_stat; ecryptfs_dentry->d_sb)->mount_crypt_stat;
offset = ECRYPTFS_FILE_SIZE_BYTES; offset = ECRYPTFS_FILE_SIZE_BYTES;
rc = contains_ecryptfs_marker(page_virt + offset); rc = ecryptfs_validate_marker(page_virt + offset);
if (rc == 0) { if (rc)
rc = -EINVAL;
goto out; goto out;
}
if (!(crypt_stat->flags & ECRYPTFS_I_SIZE_INITIALIZED)) if (!(crypt_stat->flags & ECRYPTFS_I_SIZE_INITIALIZED))
ecryptfs_i_size_init(page_virt, ecryptfs_dentry->d_inode); ecryptfs_i_size_init(page_virt, ecryptfs_dentry->d_inode);
offset += MAGIC_ECRYPTFS_MARKER_SIZE_BYTES; offset += MAGIC_ECRYPTFS_MARKER_SIZE_BYTES;
@ -1575,11 +1570,10 @@ int ecryptfs_read_and_validate_xattr_region(char *page_virt,
rc = ecryptfs_read_xattr_region(page_virt, inode); rc = ecryptfs_read_xattr_region(page_virt, inode);
if (rc) if (rc)
goto out; goto out;
if (!contains_ecryptfs_marker(page_virt + ECRYPTFS_FILE_SIZE_BYTES)) { rc = ecryptfs_validate_marker(page_virt + ECRYPTFS_FILE_SIZE_BYTES);
if (rc)
printk(KERN_WARNING "Valid data found in [%s] xattr, but " printk(KERN_WARNING "Valid data found in [%s] xattr, but "
"the marker is invalid\n", ECRYPTFS_XATTR_NAME); "the marker is invalid\n", ECRYPTFS_XATTR_NAME);
rc = -EINVAL;
}
out: out:
return rc; return rc;
} }