Commit e6e8b534 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Sasha Levin

Revert "ecryptfs: forbid opening files without mmap handler"

[ Upstream commit 78c4e172 ]

This reverts commit 2f36db71.

It fixed a local root exploit but also introduced a dependency on
the lower file system implementing an mmap operation just to open a file,
which is a bit of a heavy hammer.  The right fix is to have mmap depend
on the existence of the mmap handler instead.
Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTyler Hicks <tyhicks@canonical.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 19f46e35
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/mount.h> #include <linux/mount.h>
#include <linux/file.h>
#include "ecryptfs_kernel.h" #include "ecryptfs_kernel.h"
struct ecryptfs_open_req { struct ecryptfs_open_req {
...@@ -148,7 +147,7 @@ int ecryptfs_privileged_open(struct file **lower_file, ...@@ -148,7 +147,7 @@ int ecryptfs_privileged_open(struct file **lower_file,
flags |= IS_RDONLY(lower_dentry->d_inode) ? O_RDONLY : O_RDWR; flags |= IS_RDONLY(lower_dentry->d_inode) ? O_RDONLY : O_RDWR;
(*lower_file) = dentry_open(&req.path, flags, cred); (*lower_file) = dentry_open(&req.path, flags, cred);
if (!IS_ERR(*lower_file)) if (!IS_ERR(*lower_file))
goto have_file; goto out;
if ((flags & O_ACCMODE) == O_RDONLY) { if ((flags & O_ACCMODE) == O_RDONLY) {
rc = PTR_ERR((*lower_file)); rc = PTR_ERR((*lower_file));
goto out; goto out;
...@@ -166,16 +165,8 @@ int ecryptfs_privileged_open(struct file **lower_file, ...@@ -166,16 +165,8 @@ int ecryptfs_privileged_open(struct file **lower_file,
mutex_unlock(&ecryptfs_kthread_ctl.mux); mutex_unlock(&ecryptfs_kthread_ctl.mux);
wake_up(&ecryptfs_kthread_ctl.wait); wake_up(&ecryptfs_kthread_ctl.wait);
wait_for_completion(&req.done); wait_for_completion(&req.done);
if (IS_ERR(*lower_file)) { if (IS_ERR(*lower_file))
rc = PTR_ERR(*lower_file); rc = PTR_ERR(*lower_file);
goto out;
}
have_file:
if ((*lower_file)->f_op->mmap == NULL) {
fput(*lower_file);
*lower_file = NULL;
rc = -EMEDIUMTYPE;
}
out: out:
return rc; return rc;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment