2008-07-23 22:30:02 -06:00
|
|
|
/**
|
|
|
|
* eCryptfs: Linux filesystem encryption layer
|
|
|
|
*
|
|
|
|
* Copyright (C) 2008 International Business Machines Corp.
|
|
|
|
* Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
|
|
* License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
|
|
* 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kthread.h>
|
|
|
|
#include <linux/freezer.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 02:04:11 -06:00
|
|
|
#include <linux/slab.h>
|
2008-07-23 22:30:02 -06:00
|
|
|
#include <linux/wait.h>
|
|
|
|
#include <linux/mount.h>
|
|
|
|
#include "ecryptfs_kernel.h"
|
|
|
|
|
2012-06-25 01:38:56 -06:00
|
|
|
struct ecryptfs_open_req {
|
|
|
|
struct file **lower_file;
|
2012-06-26 11:58:53 -06:00
|
|
|
struct path path;
|
2012-06-25 01:38:56 -06:00
|
|
|
struct completion done;
|
|
|
|
struct list_head kthread_ctl_list;
|
|
|
|
};
|
2008-07-23 22:30:02 -06:00
|
|
|
|
|
|
|
static struct ecryptfs_kthread_ctl {
|
|
|
|
#define ECRYPTFS_KTHREAD_ZOMBIE 0x00000001
|
|
|
|
u32 flags;
|
|
|
|
struct mutex mux;
|
|
|
|
struct list_head req_list;
|
|
|
|
wait_queue_head_t wait;
|
|
|
|
} ecryptfs_kthread_ctl;
|
|
|
|
|
|
|
|
static struct task_struct *ecryptfs_kthread;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ecryptfs_threadfn
|
|
|
|
* @ignored: ignored
|
|
|
|
*
|
|
|
|
* The eCryptfs kernel thread that has the responsibility of getting
|
eCryptfs: Add reference counting to lower files
For any given lower inode, eCryptfs keeps only one lower file open and
multiplexes all eCryptfs file operations through that lower file. The
lower file was considered "persistent" and stayed open from the first
lookup through the lifetime of the inode.
This patch keeps the notion of a single, per-inode lower file, but adds
reference counting around the lower file so that it is closed when not
currently in use. If the reference count is at 0 when an operation (such
as open, create, etc.) needs to use the lower file, a new lower file is
opened. Since the file is no longer persistent, all references to the
term persistent file are changed to lower file.
Locking is added around the sections of code that opens the lower file
and assign the pointer in the inode info, as well as the code the fputs
the lower file when all eCryptfs users are done with it.
This patch is needed to fix issues, when mounted on top of the NFSv3
client, where the lower file is left silly renamed until the eCryptfs
inode is destroyed.
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
2011-04-14 14:35:11 -06:00
|
|
|
* the lower file with RW permissions.
|
2008-07-23 22:30:02 -06:00
|
|
|
*
|
|
|
|
* Returns zero on success; non-zero otherwise
|
|
|
|
*/
|
|
|
|
static int ecryptfs_threadfn(void *ignored)
|
|
|
|
{
|
|
|
|
set_freezable();
|
|
|
|
while (1) {
|
|
|
|
struct ecryptfs_open_req *req;
|
|
|
|
|
|
|
|
wait_event_freezable(
|
|
|
|
ecryptfs_kthread_ctl.wait,
|
|
|
|
(!list_empty(&ecryptfs_kthread_ctl.req_list)
|
|
|
|
|| kthread_should_stop()));
|
|
|
|
mutex_lock(&ecryptfs_kthread_ctl.mux);
|
|
|
|
if (ecryptfs_kthread_ctl.flags & ECRYPTFS_KTHREAD_ZOMBIE) {
|
|
|
|
mutex_unlock(&ecryptfs_kthread_ctl.mux);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
while (!list_empty(&ecryptfs_kthread_ctl.req_list)) {
|
|
|
|
req = list_first_entry(&ecryptfs_kthread_ctl.req_list,
|
|
|
|
struct ecryptfs_open_req,
|
|
|
|
kthread_ctl_list);
|
|
|
|
list_del(&req->kthread_ctl_list);
|
2012-06-26 11:58:53 -06:00
|
|
|
*req->lower_file = dentry_open(&req->path,
|
2012-06-25 01:38:56 -06:00
|
|
|
(O_RDWR | O_LARGEFILE), current_cred());
|
|
|
|
complete(&req->done);
|
2008-07-23 22:30:02 -06:00
|
|
|
}
|
|
|
|
mutex_unlock(&ecryptfs_kthread_ctl.mux);
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-08-17 09:24:05 -06:00
|
|
|
int __init ecryptfs_init_kthread(void)
|
2008-07-23 22:30:02 -06:00
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
mutex_init(&ecryptfs_kthread_ctl.mux);
|
|
|
|
init_waitqueue_head(&ecryptfs_kthread_ctl.wait);
|
|
|
|
INIT_LIST_HEAD(&ecryptfs_kthread_ctl.req_list);
|
|
|
|
ecryptfs_kthread = kthread_run(&ecryptfs_threadfn, NULL,
|
|
|
|
"ecryptfs-kthread");
|
|
|
|
if (IS_ERR(ecryptfs_kthread)) {
|
|
|
|
rc = PTR_ERR(ecryptfs_kthread);
|
|
|
|
printk(KERN_ERR "%s: Failed to create kernel thread; rc = [%d]"
|
|
|
|
"\n", __func__, rc);
|
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ecryptfs_destroy_kthread(void)
|
|
|
|
{
|
2012-08-20 20:46:05 -06:00
|
|
|
struct ecryptfs_open_req *req, *tmp;
|
2008-07-23 22:30:02 -06:00
|
|
|
|
|
|
|
mutex_lock(&ecryptfs_kthread_ctl.mux);
|
|
|
|
ecryptfs_kthread_ctl.flags |= ECRYPTFS_KTHREAD_ZOMBIE;
|
2012-08-20 20:46:05 -06:00
|
|
|
list_for_each_entry_safe(req, tmp, &ecryptfs_kthread_ctl.req_list,
|
|
|
|
kthread_ctl_list) {
|
2012-06-25 01:38:56 -06:00
|
|
|
list_del(&req->kthread_ctl_list);
|
|
|
|
*req->lower_file = ERR_PTR(-EIO);
|
|
|
|
complete(&req->done);
|
2008-07-23 22:30:02 -06:00
|
|
|
}
|
|
|
|
mutex_unlock(&ecryptfs_kthread_ctl.mux);
|
|
|
|
kthread_stop(ecryptfs_kthread);
|
|
|
|
wake_up(&ecryptfs_kthread_ctl.wait);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ecryptfs_privileged_open
|
|
|
|
* @lower_file: Result of dentry_open by root on lower dentry
|
|
|
|
* @lower_dentry: Lower dentry for file to open
|
|
|
|
* @lower_mnt: Lower vfsmount for file to open
|
|
|
|
*
|
|
|
|
* This function gets a r/w file opened againt the lower dentry.
|
|
|
|
*
|
|
|
|
* Returns zero on success; non-zero otherwise
|
|
|
|
*/
|
|
|
|
int ecryptfs_privileged_open(struct file **lower_file,
|
|
|
|
struct dentry *lower_dentry,
|
2008-11-13 16:39:22 -07:00
|
|
|
struct vfsmount *lower_mnt,
|
|
|
|
const struct cred *cred)
|
2008-07-23 22:30:02 -06:00
|
|
|
{
|
2012-06-25 01:38:56 -06:00
|
|
|
struct ecryptfs_open_req req;
|
2009-08-12 00:06:54 -06:00
|
|
|
int flags = O_LARGEFILE;
|
2008-07-23 22:30:02 -06:00
|
|
|
int rc = 0;
|
|
|
|
|
2012-06-26 11:58:53 -06:00
|
|
|
init_completion(&req.done);
|
|
|
|
req.lower_file = lower_file;
|
|
|
|
req.path.dentry = lower_dentry;
|
|
|
|
req.path.mnt = lower_mnt;
|
|
|
|
|
2008-07-23 22:30:02 -06:00
|
|
|
/* Corresponding dput() and mntput() are done when the
|
eCryptfs: Add reference counting to lower files
For any given lower inode, eCryptfs keeps only one lower file open and
multiplexes all eCryptfs file operations through that lower file. The
lower file was considered "persistent" and stayed open from the first
lookup through the lifetime of the inode.
This patch keeps the notion of a single, per-inode lower file, but adds
reference counting around the lower file so that it is closed when not
currently in use. If the reference count is at 0 when an operation (such
as open, create, etc.) needs to use the lower file, a new lower file is
opened. Since the file is no longer persistent, all references to the
term persistent file are changed to lower file.
Locking is added around the sections of code that opens the lower file
and assign the pointer in the inode info, as well as the code the fputs
the lower file when all eCryptfs users are done with it.
This patch is needed to fix issues, when mounted on top of the NFSv3
client, where the lower file is left silly renamed until the eCryptfs
inode is destroyed.
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
2011-04-14 14:35:11 -06:00
|
|
|
* lower file is fput() when all eCryptfs files for the inode are
|
|
|
|
* released. */
|
2009-08-12 00:06:54 -06:00
|
|
|
flags |= IS_RDONLY(lower_dentry->d_inode) ? O_RDONLY : O_RDWR;
|
2012-06-26 11:58:53 -06:00
|
|
|
(*lower_file) = dentry_open(&req.path, flags, cred);
|
2008-07-23 22:30:02 -06:00
|
|
|
if (!IS_ERR(*lower_file))
|
|
|
|
goto out;
|
2012-06-12 12:17:01 -06:00
|
|
|
if ((flags & O_ACCMODE) == O_RDONLY) {
|
2009-08-12 00:06:54 -06:00
|
|
|
rc = PTR_ERR((*lower_file));
|
|
|
|
goto out;
|
|
|
|
}
|
2008-07-23 22:30:02 -06:00
|
|
|
mutex_lock(&ecryptfs_kthread_ctl.mux);
|
|
|
|
if (ecryptfs_kthread_ctl.flags & ECRYPTFS_KTHREAD_ZOMBIE) {
|
|
|
|
rc = -EIO;
|
|
|
|
mutex_unlock(&ecryptfs_kthread_ctl.mux);
|
|
|
|
printk(KERN_ERR "%s: We are in the middle of shutting down; "
|
|
|
|
"aborting privileged request to open lower file\n",
|
|
|
|
__func__);
|
2012-06-25 01:38:56 -06:00
|
|
|
goto out;
|
2008-07-23 22:30:02 -06:00
|
|
|
}
|
2012-06-25 01:38:56 -06:00
|
|
|
list_add_tail(&req.kthread_ctl_list, &ecryptfs_kthread_ctl.req_list);
|
2008-07-23 22:30:02 -06:00
|
|
|
mutex_unlock(&ecryptfs_kthread_ctl.mux);
|
|
|
|
wake_up(&ecryptfs_kthread_ctl.wait);
|
2012-06-25 01:38:56 -06:00
|
|
|
wait_for_completion(&req.done);
|
|
|
|
if (IS_ERR(*lower_file))
|
|
|
|
rc = PTR_ERR(*lower_file);
|
2008-07-23 22:30:02 -06:00
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|