Commit 2c2a7552 authored Feb 14, 2020 by Aditya Pakki Committed by Tyler Hicks Feb 14, 2020

ecryptfs: replace BUG_ON with error handling code



In crypt_scatterlist, if the crypt_stat argument is not set up
correctly, the kernel crashes. Instead, by returning an error code
upstream, the error is handled safely.

The issue is detected via a static analysis tool written by us.

Fixes: 237fead6 (ecryptfs: fs/Makefile and fs/Kconfig)
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Tyler Hicks <code@tyhicks.com>

parent f8e48a84

fs/ecryptfs/crypto.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -311,8 +311,10 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
		struct extent_crypt_result ecr;
		int rc = 0;

		BUG_ON(!crypt_stat \|\| !crypt_stat->tfm
		\|\| !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED));
		if (!crypt_stat \|\| !crypt_stat->tfm
		\|\| !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED))
		return -EINVAL;

		if (unlikely(ecryptfs_verbosity > 0)) {
		ecryptfs_printk(KERN_DEBUG, "Key size [%zd]; key:\n",
		crypt_stat->key_size);

Admin message