linux-toradex.git/fs/ecryptfs/keystore.c, branch v4.0.6

eCryptfs: ensure copy to crypt_stat->cipher does not overrun

2015-02-25T01:23:28+00:00

The patch 237fead61998: "[PATCH] ecryptfs: fs/Makefile and
fs/Kconfig" from Oct 4, 2006, leads to the following static checker
warning:

  fs/ecryptfs/crypto.c:846 ecryptfs_new_file_context()
  error: off-by-one overflow 'crypt_stat->cipher' size 32.  rl = '0-32'

There is a mismatch between the size of ecryptfs_crypt_stat.cipher
and ecryptfs_mount_crypt_stat.global_default_cipher_name causing the
copy of the cipher name to cause a off-by-one string copy error. This
fix ensures the space reserved for this string is the same size including
the trailing zero at the end throughout ecryptfs.

This fix avoids increasing the size of ecryptfs_crypt_stat.cipher
and also ecryptfs_parse_tag_70_packet_silly_stack.cipher_string and instead
reduces the of ECRYPTFS_MAX_CIPHER_NAME_SIZE to 31 and includes the + 1 for
the end of string terminator.

NOTE: An overflow is not possible in practice since the value copied
into global_default_cipher_name is validated by
ecryptfs_code_for_cipher_string() at mount time. None of the allowed
cipher strings are long enough to cause the potential buffer overflow
fixed by this patch.

Signed-off-by: Colin Ian King 
Reported-by: Dan Carpenter 
[tyhicks: Added the NOTE about the overflow not being triggerable]
Signed-off-by: Tyler Hicks

eCryptfs: Remove unnecessary casts when parsing packet lengths

2014-10-29T23:32:59+00:00

The elements in the data array are already unsigned chars and do not
need to be casted.

Signed-off-by: Tyler Hicks 
Reported-by: Dan Carpenter

ecryptfs: remove unnecessary break after goto

2014-07-14T19:29:11+00:00

Signed-off-by: Fabian Frederick 
Cc: ecryptfs@vger.kernel.org
Signed-off-by: Tyler Hicks

ecryptfs: Remove unnecessary include of syscall.h in keystore.c

2014-07-03T21:38:23+00:00

There's no reason to include syscalls.h in keystore.c. Remove it.

Signed-off-by: Steven Rostedt 
Signed-off-by: Tyler Hicks

ecryptfs: Fix memory leakage in keystore.c

2013-10-16T22:18:01+00:00

In 'decrypt_pki_encrypted_session_key' function:

Initializes 'payload' pointer and releases it on exit.

Signed-off-by: Geyslan G. Bem 
Signed-off-by: Tyler Hicks 
Cc: stable@vger.kernel.org # v2.6.28+

eCryptfs: allow userspace messaging to be disabled

2013-03-04T07:59:59+00:00

When the userspace messaging (for the less common case of userspace key
wrap/unwrap via ecryptfsd) is not needed, allow eCryptfs to build with
it removed. This saves on kernel code size and reduces potential attack
surface by removing the /dev/ecryptfs node.

Signed-off-by: Kees Cook 
Signed-off-by: Tyler Hicks

eCryptfs: decrypt_pki_encrypted_session_key(): remove kfree() redundant null check

2013-02-12T18:06:01+00:00

smatch analysis:

fs/ecryptfs/keystore.c:1206 decrypt_pki_encrypted_session_key() info:
 redundant null check on msg calling kfree()

Cc: Dustin Kirkland 
Cc: ecryptfs@vger.kernel.org
Signed-off-by: Tim Gardner 
Signed-off-by: Tyler Hicks

eCryptfs: initialize payload_len in keystore.c

2013-01-17T19:31:25+00:00

This is meant to remove a compiler warning.  It should not make any
functional change.

payload_len should be initialized when it is passed to
write_tag_64_packet() as a pointer.  If that call fails, this function
should return early, and payload_len won't be used.

Signed-off-by: Simon Que 
Signed-off-by: Tyler Hicks

eCryptfs: Improve statfs reporting

2012-02-16T22:06:21+00:00

statfs() calls on eCryptfs files returned the wrong filesystem type and,
when using filename encryption, the wrong maximum filename length.

If mount-wide filename encryption is enabled, the cipher block size and
the lower filesystem's max filename length will determine the max
eCryptfs filename length. Pre-tested, known good lengths are used when
the lower filesystem's namelen is 255 and a cipher with 8 or 16 byte
block sizes is used. In other, less common cases, we fall back to a safe
rounded-down estimate when determining the eCryptfs namelen.

https://launchpad.net/bugs/885744

Signed-off-by: Tyler Hicks 
Reported-by: Kees Cook 
Reviewed-by: Kees Cook 
Reviewed-by: John Johansen

eCryptfs: Replace miscdev read/write magic numbers

2012-01-25T20:43:40+00:00

ecryptfs_miscdev_read() and ecryptfs_miscdev_write() contained many
magic numbers for specifying packet header field sizes and offsets. This
patch defines those values and replaces the magic values.

Signed-off-by: Tyler Hicks