Commit 90466255 authored by Jeffrey Mitchell's avatar Jeffrey Mitchell Committed by Tyler Hicks
Browse files

ecryptfs: fix kernel panic with null dev_name 



When mounting eCryptfs, a null "dev_name" argument to ecryptfs_mount()
causes a kernel panic if the parsed options are valid. The easiest way to
reproduce this is to call mount() from userspace with an existing
eCryptfs mount's options and a "source" argument of 0.

Error out if "dev_name" is null in ecryptfs_mount()

Fixes: 237fead6 ("[PATCH] ecryptfs: fs/Makefile and fs/Kconfig")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJeffrey Mitchell <jeffrey.mitchell@starlab.io>
Signed-off-by: default avatarTyler Hicks <code@tyhicks.com>
parent 7f06ecd3

fs/ecryptfs/main.c

+6 −0
Original line number Diff line number Diff line
@@ -492,6 +492,12 @@ static struct dentry *ecryptfs_mount(struct file_system_type *fs_type, int flags 
		goto out;

	}



	if (!dev_name) {

		rc = -EINVAL;

		err = "Device name cannot be null";

		goto out;

	}



	rc = ecryptfs_parse_options(sbi, raw_data, &check_ruid);

	if (rc) {

		err = "Error parsing options";