Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30c6b347 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

eCryptfs: fix a couple type promotion bugs 



commit 0bdf8a8245fdea6f075a5fede833a5fcf1b3466c upstream.

ECRYPTFS_SIZE_AND_MARKER_BYTES is type size_t, so if "rc" is negative
that gets type promoted to a high positive value and treated as success.

Fixes: 778aeb42 ("eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
[tyhicks: Use "if/else if" rather than "if/if"]
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 92e23f5f

fs/ecryptfs/crypto.c

+8 −4
Original line number Diff line number Diff line
@@ -1018,8 +1018,10 @@ int ecryptfs_read_and_validate_header_region(struct inode *inode) 


	rc = ecryptfs_read_lower(file_size, 0, ECRYPTFS_SIZE_AND_MARKER_BYTES,

				 inode);

	if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)

		return rc >= 0 ? -EINVAL : rc;

	if (rc < 0)

		return rc;

	else if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)

		return -EINVAL;

	rc = ecryptfs_validate_marker(marker);

	if (!rc)

		ecryptfs_i_size_init(file_size, inode);
@@ -1381,8 +1383,10 @@ int ecryptfs_read_and_validate_xattr_region(struct dentry *dentry, 
				     ecryptfs_inode_to_lower(inode),

				     ECRYPTFS_XATTR_NAME, file_size,

				     ECRYPTFS_SIZE_AND_MARKER_BYTES);

	if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)

		return rc >= 0 ? -EINVAL : rc;

	if (rc < 0)

		return rc;

	else if (rc < ECRYPTFS_SIZE_AND_MARKER_BYTES)

		return -EINVAL;

	rc = ecryptfs_validate_marker(marker);

	if (!rc)

		ecryptfs_i_size_init(file_size, inode);