diff options
| author |   Jeffrey Mitchell <jeffrey.mitchell@starlab.io> | 2021-02-26 15:00:23 -0600 |
|---|---|---|
| committer |   Tyler Hicks <code@tyhicks.com> | 2021-04-19 05:50:32 +0000 |
| commit | 9046625511ad8dfbc8c6c2de16b3532c43d68d48 (patch) | |
| tree | d2b00bbc0f0d0c975a245ba0c093823c4da8028c | |
| parent | ecryptfs: remove unused helpers (diff) | |
| download | linux-dev-9046625511ad8dfbc8c6c2de16b3532c43d68d48.tar.xz linux-dev-9046625511ad8dfbc8c6c2de16b3532c43d68d48.zip | |
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: 237fead61998 ("[PATCH] ecryptfs: fs/Makefile and fs/Kconfig")
Cc: stable@vger.kernel.org
Signed-off-by: Jeffrey Mitchell <jeffrey.mitchell@starlab.io>
Signed-off-by: Tyler Hicks <code@tyhicks.com>
| -rw-r--r-- | fs/ecryptfs/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c index 77b96737b1ff..d66bbd2df191 100644 --- a/fs/ecryptfs/main.c +++ b/fs/ecryptfs/main.c @@ -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"; |