2006-10-04 03:16:22 -06:00
|
|
|
/**
|
|
|
|
* eCryptfs: Linux filesystem encryption layer
|
|
|
|
*
|
|
|
|
* Copyright (C) 1997-2004 Erez Zadok
|
|
|
|
* Copyright (C) 2001-2004 Stony Brook University
|
2007-02-12 01:53:46 -07:00
|
|
|
* Copyright (C) 2004-2007 International Business Machines Corp.
|
2006-10-04 03:16:22 -06:00
|
|
|
* Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>
|
|
|
|
* Michael C. Thompsion <mcthomps@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/file.h>
|
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/dcache.h>
|
|
|
|
#include <linux/namei.h>
|
|
|
|
#include <linux/mount.h>
|
|
|
|
#include <linux/crypto.h>
|
2006-12-08 03:36:31 -07:00
|
|
|
#include <linux/fs_stack.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>
|
2010-10-05 10:53:45 -06:00
|
|
|
#include <linux/xattr.h>
|
2008-07-23 22:30:07 -06:00
|
|
|
#include <asm/unaligned.h>
|
2006-10-04 03:16:22 -06:00
|
|
|
#include "ecryptfs_kernel.h"
|
|
|
|
|
|
|
|
static struct dentry *lock_parent(struct dentry *dentry)
|
|
|
|
{
|
|
|
|
struct dentry *dir;
|
|
|
|
|
2008-05-12 15:02:04 -06:00
|
|
|
dir = dget_parent(dentry);
|
2007-03-07 21:41:30 -07:00
|
|
|
mutex_lock_nested(&(dir->d_inode->i_mutex), I_MUTEX_PARENT);
|
2006-10-04 03:16:22 -06:00
|
|
|
return dir;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void unlock_dir(struct dentry *dir)
|
|
|
|
{
|
|
|
|
mutex_unlock(&dir->d_inode->i_mutex);
|
|
|
|
dput(dir);
|
|
|
|
}
|
|
|
|
|
2011-05-23 20:18:20 -06:00
|
|
|
static int ecryptfs_inode_test(struct inode *inode, void *lower_inode)
|
|
|
|
{
|
|
|
|
if (ecryptfs_inode_to_lower(inode) == (struct inode *)lower_inode)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-24 01:16:51 -06:00
|
|
|
static int ecryptfs_inode_set(struct inode *inode, void *opaque)
|
2011-05-23 20:18:20 -06:00
|
|
|
{
|
2011-05-24 01:16:51 -06:00
|
|
|
struct inode *lower_inode = opaque;
|
|
|
|
|
|
|
|
ecryptfs_set_inode_lower(inode, lower_inode);
|
|
|
|
fsstack_copy_attr_all(inode, lower_inode);
|
|
|
|
/* i_size will be overwritten for encrypted regular files */
|
|
|
|
fsstack_copy_inode_size(inode, lower_inode);
|
|
|
|
inode->i_ino = lower_inode->i_ino;
|
2011-05-23 20:18:20 -06:00
|
|
|
inode->i_version++;
|
|
|
|
inode->i_mapping->a_ops = &ecryptfs_aops;
|
2011-07-26 17:15:10 -06:00
|
|
|
inode->i_mapping->backing_dev_info = inode->i_sb->s_bdi;
|
2011-05-24 01:16:51 -06:00
|
|
|
|
|
|
|
if (S_ISLNK(inode->i_mode))
|
|
|
|
inode->i_op = &ecryptfs_symlink_iops;
|
|
|
|
else if (S_ISDIR(inode->i_mode))
|
|
|
|
inode->i_op = &ecryptfs_dir_iops;
|
|
|
|
else
|
|
|
|
inode->i_op = &ecryptfs_main_iops;
|
|
|
|
|
|
|
|
if (S_ISDIR(inode->i_mode))
|
|
|
|
inode->i_fop = &ecryptfs_dir_fops;
|
|
|
|
else if (special_file(inode->i_mode))
|
|
|
|
init_special_inode(inode, inode->i_mode, inode->i_rdev);
|
|
|
|
else
|
|
|
|
inode->i_fop = &ecryptfs_main_fops;
|
|
|
|
|
2011-05-23 20:18:20 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-24 01:16:51 -06:00
|
|
|
static struct inode *__ecryptfs_get_inode(struct inode *lower_inode,
|
|
|
|
struct super_block *sb)
|
2011-05-23 20:18:20 -06:00
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
|
2011-05-24 01:16:51 -06:00
|
|
|
if (lower_inode->i_sb != ecryptfs_superblock_to_lower(sb))
|
|
|
|
return ERR_PTR(-EXDEV);
|
|
|
|
if (!igrab(lower_inode))
|
|
|
|
return ERR_PTR(-ESTALE);
|
2011-05-23 20:18:20 -06:00
|
|
|
inode = iget5_locked(sb, (unsigned long)lower_inode,
|
|
|
|
ecryptfs_inode_test, ecryptfs_inode_set,
|
|
|
|
lower_inode);
|
|
|
|
if (!inode) {
|
|
|
|
iput(lower_inode);
|
2011-05-24 01:16:51 -06:00
|
|
|
return ERR_PTR(-EACCES);
|
2011-05-23 20:18:20 -06:00
|
|
|
}
|
2011-05-24 01:16:51 -06:00
|
|
|
if (!(inode->i_state & I_NEW))
|
2011-05-23 20:18:20 -06:00
|
|
|
iput(lower_inode);
|
2011-05-24 01:16:51 -06:00
|
|
|
|
|
|
|
return inode;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct inode *ecryptfs_get_inode(struct inode *lower_inode,
|
|
|
|
struct super_block *sb)
|
|
|
|
{
|
|
|
|
struct inode *inode = __ecryptfs_get_inode(lower_inode, sb);
|
|
|
|
|
|
|
|
if (!IS_ERR(inode) && (inode->i_state & I_NEW))
|
|
|
|
unlock_new_inode(inode);
|
|
|
|
|
2011-05-23 20:18:20 -06:00
|
|
|
return inode;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ecryptfs_interpose
|
|
|
|
* @lower_dentry: Existing dentry in the lower filesystem
|
|
|
|
* @dentry: ecryptfs' dentry
|
|
|
|
* @sb: ecryptfs's super_block
|
|
|
|
*
|
|
|
|
* Interposes upper and lower dentries.
|
|
|
|
*
|
|
|
|
* Returns zero on success; non-zero otherwise
|
|
|
|
*/
|
|
|
|
static int ecryptfs_interpose(struct dentry *lower_dentry,
|
2011-05-24 01:16:51 -06:00
|
|
|
struct dentry *dentry, struct super_block *sb)
|
2011-05-23 20:18:20 -06:00
|
|
|
{
|
2011-05-24 01:16:51 -06:00
|
|
|
struct inode *inode = ecryptfs_get_inode(lower_dentry->d_inode, sb);
|
|
|
|
|
2011-05-23 20:18:20 -06:00
|
|
|
if (IS_ERR(inode))
|
|
|
|
return PTR_ERR(inode);
|
2011-05-24 01:16:51 -06:00
|
|
|
d_instantiate(dentry, inode);
|
|
|
|
|
2011-05-23 20:18:20 -06:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-05-22 14:09:50 -06:00
|
|
|
static int ecryptfs_do_unlink(struct inode *dir, struct dentry *dentry,
|
|
|
|
struct inode *inode)
|
|
|
|
{
|
|
|
|
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
|
|
|
|
struct dentry *lower_dir_dentry;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
dget(lower_dentry);
|
|
|
|
lower_dir_dentry = lock_parent(lower_dentry);
|
|
|
|
rc = vfs_unlink(lower_dir_inode, lower_dentry);
|
|
|
|
if (rc) {
|
|
|
|
printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
fsstack_copy_attr_times(dir, lower_dir_inode);
|
|
|
|
set_nlink(inode, ecryptfs_inode_to_lower(inode)->i_nlink);
|
|
|
|
inode->i_ctime = dir->i_ctime;
|
|
|
|
d_drop(dentry);
|
|
|
|
out_unlock:
|
|
|
|
unlock_dir(lower_dir_dentry);
|
|
|
|
dput(lower_dentry);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2006-10-04 03:16:22 -06:00
|
|
|
/**
|
|
|
|
* ecryptfs_do_create
|
|
|
|
* @directory_inode: inode of the new file's dentry's parent in ecryptfs
|
|
|
|
* @ecryptfs_dentry: New file's dentry in ecryptfs
|
|
|
|
* @mode: The mode of the new file
|
|
|
|
* @nd: nameidata of ecryptfs' parent's dentry & vfsmount
|
|
|
|
*
|
|
|
|
* Creates the underlying file and the eCryptfs inode which will link to
|
|
|
|
* it. It will also update the eCryptfs directory inode to mimic the
|
|
|
|
* stat of the lower directory inode.
|
|
|
|
*
|
2011-11-21 16:31:02 -07:00
|
|
|
* Returns the new eCryptfs inode on success; an ERR_PTR on error condition
|
2006-10-04 03:16:22 -06:00
|
|
|
*/
|
2011-11-21 16:31:02 -07:00
|
|
|
static struct inode *
|
2006-10-04 03:16:22 -06:00
|
|
|
ecryptfs_do_create(struct inode *directory_inode,
|
2011-07-26 01:30:54 -06:00
|
|
|
struct dentry *ecryptfs_dentry, umode_t mode)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct dentry *lower_dentry;
|
|
|
|
struct dentry *lower_dir_dentry;
|
2011-11-21 16:31:02 -07:00
|
|
|
struct inode *inode;
|
2006-10-04 03:16:22 -06:00
|
|
|
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry);
|
|
|
|
lower_dir_dentry = lock_parent(lower_dentry);
|
2008-04-29 02:03:09 -06:00
|
|
|
if (IS_ERR(lower_dir_dentry)) {
|
2006-10-04 03:16:22 -06:00
|
|
|
ecryptfs_printk(KERN_ERR, "Error locking directory of "
|
|
|
|
"dentry\n");
|
2011-11-21 16:31:02 -07:00
|
|
|
inode = ERR_CAST(lower_dir_dentry);
|
2006-10-04 03:16:22 -06:00
|
|
|
goto out;
|
|
|
|
}
|
2012-06-10 16:09:36 -06:00
|
|
|
rc = vfs_create(lower_dir_dentry->d_inode, lower_dentry, mode, true);
|
2007-10-16 02:28:09 -06:00
|
|
|
if (rc) {
|
2008-01-08 16:33:02 -07:00
|
|
|
printk(KERN_ERR "%s: Failure to create dentry in lower fs; "
|
2008-04-29 01:59:48 -06:00
|
|
|
"rc = [%d]\n", __func__, rc);
|
2011-11-21 16:31:02 -07:00
|
|
|
inode = ERR_PTR(rc);
|
2008-01-08 16:33:02 -07:00
|
|
|
goto out_lock;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
2011-11-21 16:31:02 -07:00
|
|
|
inode = __ecryptfs_get_inode(lower_dentry->d_inode,
|
|
|
|
directory_inode->i_sb);
|
2012-05-22 14:09:50 -06:00
|
|
|
if (IS_ERR(inode)) {
|
|
|
|
vfs_unlink(lower_dir_dentry->d_inode, lower_dentry);
|
2006-10-04 03:16:22 -06:00
|
|
|
goto out_lock;
|
2012-05-22 14:09:50 -06:00
|
|
|
}
|
2006-12-08 03:36:31 -07:00
|
|
|
fsstack_copy_attr_times(directory_inode, lower_dir_dentry->d_inode);
|
|
|
|
fsstack_copy_inode_size(directory_inode, lower_dir_dentry->d_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
out_lock:
|
|
|
|
unlock_dir(lower_dir_dentry);
|
|
|
|
out:
|
2011-11-21 16:31:02 -07:00
|
|
|
return inode;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ecryptfs_initialize_file
|
|
|
|
*
|
|
|
|
* Cause the file to be changed from a basic empty file to an ecryptfs
|
|
|
|
* file with a header and first data page.
|
|
|
|
*
|
|
|
|
* Returns zero on success
|
|
|
|
*/
|
2012-06-21 00:50:59 -06:00
|
|
|
int ecryptfs_initialize_file(struct dentry *ecryptfs_dentry,
|
|
|
|
struct inode *ecryptfs_inode)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
2007-10-16 02:28:10 -06:00
|
|
|
struct ecryptfs_crypt_stat *crypt_stat =
|
2011-11-21 16:31:02 -07:00
|
|
|
&ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat;
|
2006-10-04 03:16:22 -06:00
|
|
|
int rc = 0;
|
|
|
|
|
2011-11-21 16:31:02 -07:00
|
|
|
if (S_ISDIR(ecryptfs_inode->i_mode)) {
|
2006-10-04 03:16:22 -06:00
|
|
|
ecryptfs_printk(KERN_DEBUG, "This is a directory\n");
|
2007-02-12 01:53:49 -07:00
|
|
|
crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
|
2007-10-16 02:28:10 -06:00
|
|
|
goto out;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
ecryptfs_printk(KERN_DEBUG, "Initializing crypto context\n");
|
2011-11-21 16:31:02 -07:00
|
|
|
rc = ecryptfs_new_file_context(ecryptfs_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (rc) {
|
2007-10-16 02:28:10 -06:00
|
|
|
ecryptfs_printk(KERN_ERR, "Error creating new file "
|
|
|
|
"context; rc = [%d]\n", rc);
|
|
|
|
goto out;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
2011-11-21 16:31:02 -07:00
|
|
|
rc = ecryptfs_get_lower_file(ecryptfs_dentry, ecryptfs_inode);
|
2010-11-03 04:11:28 -06:00
|
|
|
if (rc) {
|
|
|
|
printk(KERN_ERR "%s: Error attempting to initialize "
|
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 for the dentry with name "
|
2010-11-03 04:11:28 -06:00
|
|
|
"[%s]; rc = [%d]\n", __func__,
|
|
|
|
ecryptfs_dentry->d_name.name, rc);
|
|
|
|
goto out;
|
2008-07-23 22:30:08 -06:00
|
|
|
}
|
2011-11-21 16:31:02 -07:00
|
|
|
rc = ecryptfs_write_metadata(ecryptfs_dentry, ecryptfs_inode);
|
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
|
|
|
if (rc)
|
2007-10-16 02:28:10 -06:00
|
|
|
printk(KERN_ERR "Error writing headers; rc = [%d]\n", rc);
|
2011-11-21 16:31:02 -07:00
|
|
|
ecryptfs_put_lower_file(ecryptfs_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ecryptfs_create
|
|
|
|
* @dir: The inode of the directory in which to create the file.
|
|
|
|
* @dentry: The eCryptfs dentry
|
|
|
|
* @mode: The mode of the new file.
|
|
|
|
*
|
|
|
|
* Creates a new file.
|
|
|
|
*
|
|
|
|
* Returns zero on success; non-zero on error condition
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
ecryptfs_create(struct inode *directory_inode, struct dentry *ecryptfs_dentry,
|
2012-06-10 16:05:36 -06:00
|
|
|
umode_t mode, bool excl)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
2011-11-21 16:31:02 -07:00
|
|
|
struct inode *ecryptfs_inode;
|
2006-10-04 03:16:22 -06:00
|
|
|
int rc;
|
|
|
|
|
2011-11-21 16:31:02 -07:00
|
|
|
ecryptfs_inode = ecryptfs_do_create(directory_inode, ecryptfs_dentry,
|
|
|
|
mode);
|
|
|
|
if (unlikely(IS_ERR(ecryptfs_inode))) {
|
2006-10-04 03:16:22 -06:00
|
|
|
ecryptfs_printk(KERN_WARNING, "Failed to create file in"
|
|
|
|
"lower filesystem\n");
|
2011-11-21 16:31:02 -07:00
|
|
|
rc = PTR_ERR(ecryptfs_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* At this point, a file exists on "disk"; we need to make sure
|
|
|
|
* that this on disk file is prepared to be an ecryptfs file */
|
2011-11-21 16:31:02 -07:00
|
|
|
rc = ecryptfs_initialize_file(ecryptfs_dentry, ecryptfs_inode);
|
|
|
|
if (rc) {
|
2012-05-22 14:09:50 -06:00
|
|
|
ecryptfs_do_unlink(directory_inode, ecryptfs_dentry,
|
|
|
|
ecryptfs_inode);
|
|
|
|
make_bad_inode(ecryptfs_inode);
|
2011-11-21 16:31:02 -07:00
|
|
|
unlock_new_inode(ecryptfs_inode);
|
|
|
|
iput(ecryptfs_inode);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
unlock_new_inode(ecryptfs_inode);
|
2012-07-18 23:18:15 -06:00
|
|
|
d_instantiate(ecryptfs_dentry, ecryptfs_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-05-24 03:56:23 -06:00
|
|
|
static int ecryptfs_i_size_read(struct dentry *dentry, struct inode *inode)
|
|
|
|
{
|
|
|
|
struct ecryptfs_crypt_stat *crypt_stat;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = ecryptfs_get_lower_file(dentry, inode);
|
|
|
|
if (rc) {
|
|
|
|
printk(KERN_ERR "%s: Error attempting to initialize "
|
|
|
|
"the lower file for the dentry with name "
|
|
|
|
"[%s]; rc = [%d]\n", __func__,
|
|
|
|
dentry->d_name.name, rc);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;
|
|
|
|
/* TODO: lock for crypt_stat comparison */
|
|
|
|
if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED))
|
|
|
|
ecryptfs_set_default_sizes(crypt_stat);
|
|
|
|
|
|
|
|
rc = ecryptfs_read_and_validate_header_region(inode);
|
|
|
|
ecryptfs_put_lower_file(inode);
|
|
|
|
if (rc) {
|
|
|
|
rc = ecryptfs_read_and_validate_xattr_region(dentry, inode);
|
|
|
|
if (!rc)
|
|
|
|
crypt_stat->flags |= ECRYPTFS_METADATA_IN_XATTR;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Must return 0 to allow non-eCryptfs files to be looked up, too */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-04 03:16:22 -06:00
|
|
|
/**
|
2011-05-24 01:16:51 -06:00
|
|
|
* ecryptfs_lookup_interpose - Dentry interposition for a lookup
|
2006-10-04 03:16:22 -06:00
|
|
|
*/
|
2011-05-24 03:56:23 -06:00
|
|
|
static int ecryptfs_lookup_interpose(struct dentry *dentry,
|
2011-05-24 01:16:51 -06:00
|
|
|
struct dentry *lower_dentry,
|
2011-05-24 03:56:23 -06:00
|
|
|
struct inode *dir_inode)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
2011-05-24 03:56:23 -06:00
|
|
|
struct inode *inode, *lower_inode = lower_dentry->d_inode;
|
|
|
|
struct ecryptfs_dentry_info *dentry_info;
|
2006-10-04 03:16:22 -06:00
|
|
|
struct vfsmount *lower_mnt;
|
2011-05-24 03:56:23 -06:00
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
dentry_info = kmem_cache_alloc(ecryptfs_dentry_info_cache, GFP_KERNEL);
|
|
|
|
if (!dentry_info) {
|
2009-01-06 15:42:00 -07:00
|
|
|
printk(KERN_ERR "%s: Out of memory whilst attempting "
|
|
|
|
"to allocate ecryptfs_dentry_info struct\n",
|
|
|
|
__func__);
|
2011-05-24 03:56:23 -06:00
|
|
|
dput(lower_dentry);
|
|
|
|
return -ENOMEM;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
2012-07-20 02:09:19 -06:00
|
|
|
|
|
|
|
lower_mnt = mntget(ecryptfs_dentry_to_lower_mnt(dentry->d_parent));
|
|
|
|
fsstack_copy_attr_atime(dir_inode, lower_dentry->d_parent->d_inode);
|
|
|
|
BUG_ON(!lower_dentry->d_count);
|
|
|
|
|
|
|
|
ecryptfs_set_dentry_private(dentry, dentry_info);
|
2011-05-24 03:56:23 -06:00
|
|
|
ecryptfs_set_dentry_lower(dentry, lower_dentry);
|
|
|
|
ecryptfs_set_dentry_lower_mnt(dentry, lower_mnt);
|
|
|
|
|
2006-10-04 03:16:22 -06:00
|
|
|
if (!lower_dentry->d_inode) {
|
|
|
|
/* We want to add because we couldn't find in lower */
|
2011-05-24 03:56:23 -06:00
|
|
|
d_add(dentry, NULL);
|
|
|
|
return 0;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
2011-05-24 03:56:23 -06:00
|
|
|
inode = __ecryptfs_get_inode(lower_inode, dir_inode->i_sb);
|
2011-05-24 01:16:51 -06:00
|
|
|
if (IS_ERR(inode)) {
|
2011-05-24 03:56:23 -06:00
|
|
|
printk(KERN_ERR "%s: Error interposing; rc = [%ld]\n",
|
|
|
|
__func__, PTR_ERR(inode));
|
|
|
|
return PTR_ERR(inode);
|
2008-07-23 22:30:08 -06:00
|
|
|
}
|
2011-05-24 03:56:23 -06:00
|
|
|
if (S_ISREG(inode->i_mode)) {
|
|
|
|
rc = ecryptfs_i_size_read(dentry, inode);
|
2007-02-12 01:53:46 -07:00
|
|
|
if (rc) {
|
2011-05-24 03:56:23 -06:00
|
|
|
make_bad_inode(inode);
|
|
|
|
return rc;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
}
|
2011-05-24 03:56:23 -06:00
|
|
|
|
2011-05-24 02:49:02 -06:00
|
|
|
if (inode->i_state & I_NEW)
|
|
|
|
unlock_new_inode(inode);
|
2011-05-24 03:56:23 -06:00
|
|
|
d_add(dentry, inode);
|
|
|
|
|
2009-01-06 15:42:00 -07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ecryptfs_lookup
|
|
|
|
* @ecryptfs_dir_inode: The eCryptfs directory inode
|
|
|
|
* @ecryptfs_dentry: The eCryptfs dentry that we are looking up
|
|
|
|
* @ecryptfs_nd: nameidata; may be NULL
|
|
|
|
*
|
|
|
|
* Find a file on disk. If the file does not exist, then we'll add it to the
|
|
|
|
* dentry cache and continue on to read it from the disk.
|
|
|
|
*/
|
|
|
|
static struct dentry *ecryptfs_lookup(struct inode *ecryptfs_dir_inode,
|
|
|
|
struct dentry *ecryptfs_dentry,
|
2012-06-10 15:13:09 -06:00
|
|
|
unsigned int flags)
|
2009-01-06 15:42:00 -07:00
|
|
|
{
|
|
|
|
char *encrypted_and_encoded_name = NULL;
|
2009-01-06 15:42:03 -07:00
|
|
|
size_t encrypted_and_encoded_name_size;
|
2009-01-06 15:42:00 -07:00
|
|
|
struct ecryptfs_mount_crypt_stat *mount_crypt_stat = NULL;
|
|
|
|
struct dentry *lower_dir_dentry, *lower_dentry;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
lower_dir_dentry = ecryptfs_dentry_to_lower(ecryptfs_dentry->d_parent);
|
2011-02-17 17:51:24 -07:00
|
|
|
mutex_lock(&lower_dir_dentry->d_inode->i_mutex);
|
|
|
|
lower_dentry = lookup_one_len(ecryptfs_dentry->d_name.name,
|
|
|
|
lower_dir_dentry,
|
|
|
|
ecryptfs_dentry->d_name.len);
|
|
|
|
mutex_unlock(&lower_dir_dentry->d_inode->i_mutex);
|
2009-01-06 15:42:00 -07:00
|
|
|
if (IS_ERR(lower_dentry)) {
|
|
|
|
rc = PTR_ERR(lower_dentry);
|
2011-02-17 17:51:24 -07:00
|
|
|
ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned "
|
2010-03-25 10:16:56 -06:00
|
|
|
"[%d] on lower_dentry = [%s]\n", __func__, rc,
|
2012-07-20 02:03:41 -06:00
|
|
|
ecryptfs_dentry->d_name.name);
|
|
|
|
goto out;
|
2009-01-06 15:42:00 -07:00
|
|
|
}
|
|
|
|
if (lower_dentry->d_inode)
|
2011-05-24 01:16:51 -06:00
|
|
|
goto interpose;
|
2009-03-20 01:23:57 -06:00
|
|
|
mount_crypt_stat = &ecryptfs_superblock_to_private(
|
|
|
|
ecryptfs_dentry->d_sb)->mount_crypt_stat;
|
|
|
|
if (!(mount_crypt_stat
|
|
|
|
&& (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES)))
|
2011-05-24 01:16:51 -06:00
|
|
|
goto interpose;
|
2009-01-06 15:42:00 -07:00
|
|
|
dput(lower_dentry);
|
|
|
|
rc = ecryptfs_encrypt_and_encode_filename(
|
|
|
|
&encrypted_and_encoded_name, &encrypted_and_encoded_name_size,
|
2009-03-20 01:23:57 -06:00
|
|
|
NULL, mount_crypt_stat, ecryptfs_dentry->d_name.name,
|
2009-01-06 15:42:00 -07:00
|
|
|
ecryptfs_dentry->d_name.len);
|
|
|
|
if (rc) {
|
|
|
|
printk(KERN_ERR "%s: Error attempting to encrypt and encode "
|
|
|
|
"filename; rc = [%d]\n", __func__, rc);
|
2012-07-20 02:03:41 -06:00
|
|
|
goto out;
|
2009-01-06 15:42:00 -07:00
|
|
|
}
|
2011-02-17 17:51:24 -07:00
|
|
|
mutex_lock(&lower_dir_dentry->d_inode->i_mutex);
|
|
|
|
lower_dentry = lookup_one_len(encrypted_and_encoded_name,
|
|
|
|
lower_dir_dentry,
|
|
|
|
encrypted_and_encoded_name_size);
|
|
|
|
mutex_unlock(&lower_dir_dentry->d_inode->i_mutex);
|
2009-01-06 15:42:00 -07:00
|
|
|
if (IS_ERR(lower_dentry)) {
|
|
|
|
rc = PTR_ERR(lower_dentry);
|
2011-02-17 17:51:24 -07:00
|
|
|
ecryptfs_printk(KERN_DEBUG, "%s: lookup_one_len() returned "
|
2010-03-25 10:16:56 -06:00
|
|
|
"[%d] on lower_dentry = [%s]\n", __func__, rc,
|
|
|
|
encrypted_and_encoded_name);
|
2012-07-20 02:03:41 -06:00
|
|
|
goto out;
|
2009-01-06 15:42:00 -07:00
|
|
|
}
|
2011-05-24 01:16:51 -06:00
|
|
|
interpose:
|
|
|
|
rc = ecryptfs_lookup_interpose(ecryptfs_dentry, lower_dentry,
|
|
|
|
ecryptfs_dir_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
out:
|
2009-01-06 15:42:00 -07:00
|
|
|
kfree(encrypted_and_encoded_name);
|
2006-10-04 03:16:22 -06:00
|
|
|
return ERR_PTR(rc);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ecryptfs_link(struct dentry *old_dentry, struct inode *dir,
|
|
|
|
struct dentry *new_dentry)
|
|
|
|
{
|
|
|
|
struct dentry *lower_old_dentry;
|
|
|
|
struct dentry *lower_new_dentry;
|
|
|
|
struct dentry *lower_dir_dentry;
|
|
|
|
u64 file_size_save;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
file_size_save = i_size_read(old_dentry->d_inode);
|
|
|
|
lower_old_dentry = ecryptfs_dentry_to_lower(old_dentry);
|
|
|
|
lower_new_dentry = ecryptfs_dentry_to_lower(new_dentry);
|
|
|
|
dget(lower_old_dentry);
|
|
|
|
dget(lower_new_dentry);
|
|
|
|
lower_dir_dentry = lock_parent(lower_new_dentry);
|
|
|
|
rc = vfs_link(lower_old_dentry, lower_dir_dentry->d_inode,
|
|
|
|
lower_new_dentry);
|
|
|
|
if (rc || !lower_new_dentry->d_inode)
|
|
|
|
goto out_lock;
|
2011-05-24 01:16:51 -06:00
|
|
|
rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (rc)
|
|
|
|
goto out_lock;
|
2010-03-23 17:09:02 -06:00
|
|
|
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
|
|
|
|
fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
|
2011-10-28 06:13:29 -06:00
|
|
|
set_nlink(old_dentry->d_inode,
|
|
|
|
ecryptfs_inode_to_lower(old_dentry->d_inode)->i_nlink);
|
2006-10-04 03:16:22 -06:00
|
|
|
i_size_write(new_dentry->d_inode, file_size_save);
|
|
|
|
out_lock:
|
|
|
|
unlock_dir(lower_dir_dentry);
|
|
|
|
dput(lower_new_dentry);
|
|
|
|
dput(lower_old_dentry);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ecryptfs_unlink(struct inode *dir, struct dentry *dentry)
|
|
|
|
{
|
2012-05-22 14:09:50 -06:00
|
|
|
return ecryptfs_do_unlink(dir, dentry, dentry->d_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ecryptfs_symlink(struct inode *dir, struct dentry *dentry,
|
|
|
|
const char *symname)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct dentry *lower_dentry;
|
|
|
|
struct dentry *lower_dir_dentry;
|
|
|
|
char *encoded_symname;
|
2009-01-06 15:42:00 -07:00
|
|
|
size_t encoded_symlen;
|
|
|
|
struct ecryptfs_mount_crypt_stat *mount_crypt_stat = NULL;
|
2006-10-04 03:16:22 -06:00
|
|
|
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
dget(lower_dentry);
|
|
|
|
lower_dir_dentry = lock_parent(lower_dentry);
|
2009-01-06 15:42:00 -07:00
|
|
|
mount_crypt_stat = &ecryptfs_superblock_to_private(
|
|
|
|
dir->i_sb)->mount_crypt_stat;
|
|
|
|
rc = ecryptfs_encrypt_and_encode_filename(&encoded_symname,
|
|
|
|
&encoded_symlen,
|
|
|
|
NULL,
|
|
|
|
mount_crypt_stat, symname,
|
|
|
|
strlen(symname));
|
|
|
|
if (rc)
|
2006-10-04 03:16:22 -06:00
|
|
|
goto out_lock;
|
|
|
|
rc = vfs_symlink(lower_dir_dentry->d_inode, lower_dentry,
|
2008-06-24 08:50:16 -06:00
|
|
|
encoded_symname);
|
2006-10-04 03:16:22 -06:00
|
|
|
kfree(encoded_symname);
|
|
|
|
if (rc || !lower_dentry->d_inode)
|
|
|
|
goto out_lock;
|
2011-05-24 01:16:51 -06:00
|
|
|
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (rc)
|
|
|
|
goto out_lock;
|
2006-12-08 03:36:31 -07:00
|
|
|
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
|
|
|
|
fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
out_lock:
|
|
|
|
unlock_dir(lower_dir_dentry);
|
|
|
|
dput(lower_dentry);
|
|
|
|
if (!dentry->d_inode)
|
|
|
|
d_drop(dentry);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-07-25 23:41:39 -06:00
|
|
|
static int ecryptfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct dentry *lower_dentry;
|
|
|
|
struct dentry *lower_dir_dentry;
|
|
|
|
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
lower_dir_dentry = lock_parent(lower_dentry);
|
|
|
|
rc = vfs_mkdir(lower_dir_dentry->d_inode, lower_dentry, mode);
|
|
|
|
if (rc || !lower_dentry->d_inode)
|
|
|
|
goto out;
|
2011-05-24 01:16:51 -06:00
|
|
|
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (rc)
|
|
|
|
goto out;
|
2006-12-08 03:36:31 -07:00
|
|
|
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
|
|
|
|
fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
|
2011-10-28 06:13:29 -06:00
|
|
|
set_nlink(dir, lower_dir_dentry->d_inode->i_nlink);
|
2006-10-04 03:16:22 -06:00
|
|
|
out:
|
|
|
|
unlock_dir(lower_dir_dentry);
|
|
|
|
if (!dentry->d_inode)
|
|
|
|
d_drop(dentry);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ecryptfs_rmdir(struct inode *dir, struct dentry *dentry)
|
|
|
|
{
|
|
|
|
struct dentry *lower_dentry;
|
|
|
|
struct dentry *lower_dir_dentry;
|
2006-10-30 23:07:20 -07:00
|
|
|
int rc;
|
2006-10-04 03:16:22 -06:00
|
|
|
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
2006-10-30 23:07:20 -07:00
|
|
|
dget(dentry);
|
2006-10-04 03:16:22 -06:00
|
|
|
lower_dir_dentry = lock_parent(lower_dentry);
|
2006-10-30 23:07:20 -07:00
|
|
|
dget(lower_dentry);
|
2006-10-04 03:16:22 -06:00
|
|
|
rc = vfs_rmdir(lower_dir_dentry->d_inode, lower_dentry);
|
2006-10-30 23:07:20 -07:00
|
|
|
dput(lower_dentry);
|
2011-04-29 15:26:27 -06:00
|
|
|
if (!rc && dentry->d_inode)
|
|
|
|
clear_nlink(dentry->d_inode);
|
2006-12-08 03:36:31 -07:00
|
|
|
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
|
2011-10-28 06:13:29 -06:00
|
|
|
set_nlink(dir, lower_dir_dentry->d_inode->i_nlink);
|
2006-10-04 03:16:22 -06:00
|
|
|
unlock_dir(lower_dir_dentry);
|
|
|
|
if (!rc)
|
|
|
|
d_drop(dentry);
|
2006-10-30 23:07:20 -07:00
|
|
|
dput(dentry);
|
2006-10-04 03:16:22 -06:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2011-07-25 23:52:52 -06:00
|
|
|
ecryptfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct dentry *lower_dentry;
|
|
|
|
struct dentry *lower_dir_dentry;
|
|
|
|
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
lower_dir_dentry = lock_parent(lower_dentry);
|
|
|
|
rc = vfs_mknod(lower_dir_dentry->d_inode, lower_dentry, mode, dev);
|
|
|
|
if (rc || !lower_dentry->d_inode)
|
|
|
|
goto out;
|
2011-05-24 01:16:51 -06:00
|
|
|
rc = ecryptfs_interpose(lower_dentry, dentry, dir->i_sb);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (rc)
|
|
|
|
goto out;
|
2006-12-08 03:36:31 -07:00
|
|
|
fsstack_copy_attr_times(dir, lower_dir_dentry->d_inode);
|
|
|
|
fsstack_copy_inode_size(dir, lower_dir_dentry->d_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
out:
|
|
|
|
unlock_dir(lower_dir_dentry);
|
|
|
|
if (!dentry->d_inode)
|
|
|
|
d_drop(dentry);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ecryptfs_rename(struct inode *old_dir, struct dentry *old_dentry,
|
|
|
|
struct inode *new_dir, struct dentry *new_dentry)
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
struct dentry *lower_old_dentry;
|
|
|
|
struct dentry *lower_new_dentry;
|
|
|
|
struct dentry *lower_old_dir_dentry;
|
|
|
|
struct dentry *lower_new_dir_dentry;
|
2009-12-05 19:17:09 -07:00
|
|
|
struct dentry *trap = NULL;
|
2012-09-13 13:00:56 -06:00
|
|
|
struct inode *target_inode;
|
2006-10-04 03:16:22 -06:00
|
|
|
|
|
|
|
lower_old_dentry = ecryptfs_dentry_to_lower(old_dentry);
|
|
|
|
lower_new_dentry = ecryptfs_dentry_to_lower(new_dentry);
|
|
|
|
dget(lower_old_dentry);
|
|
|
|
dget(lower_new_dentry);
|
|
|
|
lower_old_dir_dentry = dget_parent(lower_old_dentry);
|
|
|
|
lower_new_dir_dentry = dget_parent(lower_new_dentry);
|
2012-09-13 13:00:56 -06:00
|
|
|
target_inode = new_dentry->d_inode;
|
2009-12-05 19:17:09 -07:00
|
|
|
trap = lock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
|
|
|
|
/* source should not be ancestor of target */
|
|
|
|
if (trap == lower_old_dentry) {
|
|
|
|
rc = -EINVAL;
|
|
|
|
goto out_lock;
|
|
|
|
}
|
|
|
|
/* target should not be ancestor of source */
|
|
|
|
if (trap == lower_new_dentry) {
|
|
|
|
rc = -ENOTEMPTY;
|
|
|
|
goto out_lock;
|
|
|
|
}
|
2006-10-04 03:16:22 -06:00
|
|
|
rc = vfs_rename(lower_old_dir_dentry->d_inode, lower_old_dentry,
|
|
|
|
lower_new_dir_dentry->d_inode, lower_new_dentry);
|
|
|
|
if (rc)
|
|
|
|
goto out_lock;
|
2012-09-13 13:00:56 -06:00
|
|
|
if (target_inode)
|
|
|
|
fsstack_copy_attr_all(target_inode,
|
|
|
|
ecryptfs_inode_to_lower(target_inode));
|
2009-12-02 17:51:54 -07:00
|
|
|
fsstack_copy_attr_all(new_dir, lower_new_dir_dentry->d_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (new_dir != old_dir)
|
2009-12-02 17:51:54 -07:00
|
|
|
fsstack_copy_attr_all(old_dir, lower_old_dir_dentry->d_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
out_lock:
|
|
|
|
unlock_rename(lower_old_dir_dentry, lower_new_dir_dentry);
|
2011-04-12 10:23:09 -06:00
|
|
|
dput(lower_new_dir_dentry);
|
|
|
|
dput(lower_old_dir_dentry);
|
2006-10-04 03:16:22 -06:00
|
|
|
dput(lower_new_dentry);
|
|
|
|
dput(lower_old_dentry);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-03-21 23:41:35 -06:00
|
|
|
static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
|
|
|
|
size_t *bufsiz)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
2010-03-21 23:41:35 -06:00
|
|
|
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
2006-10-04 03:16:22 -06:00
|
|
|
char *lower_buf;
|
2009-01-06 15:42:00 -07:00
|
|
|
mm_segment_t old_fs;
|
|
|
|
int rc;
|
2006-10-04 03:16:22 -06:00
|
|
|
|
2012-05-03 07:34:20 -06:00
|
|
|
lower_buf = kmalloc(PATH_MAX, GFP_KERNEL);
|
2010-03-21 23:41:35 -06:00
|
|
|
if (!lower_buf) {
|
2006-10-04 03:16:22 -06:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
old_fs = get_fs();
|
|
|
|
set_fs(get_ds());
|
|
|
|
rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
|
|
|
|
(char __user *)lower_buf,
|
2012-05-03 07:34:20 -06:00
|
|
|
PATH_MAX);
|
2006-10-04 03:16:22 -06:00
|
|
|
set_fs(old_fs);
|
2010-03-21 23:41:35 -06:00
|
|
|
if (rc < 0)
|
|
|
|
goto out;
|
|
|
|
rc = ecryptfs_decode_and_decrypt_filename(buf, bufsiz, dentry,
|
2012-05-03 07:34:20 -06:00
|
|
|
lower_buf, rc);
|
2010-03-21 23:41:35 -06:00
|
|
|
out:
|
2006-10-04 03:16:22 -06:00
|
|
|
kfree(lower_buf);
|
2010-03-21 23:41:35 -06:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-05-03 07:34:20 -06:00
|
|
|
static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
|
2010-03-21 23:41:35 -06:00
|
|
|
{
|
2012-05-03 07:34:20 -06:00
|
|
|
char *buf;
|
|
|
|
size_t len = PATH_MAX;
|
2010-03-21 23:41:35 -06:00
|
|
|
int rc;
|
|
|
|
|
2012-05-03 07:34:20 -06:00
|
|
|
rc = ecryptfs_readlink_lower(dentry, &buf, &len);
|
2010-03-21 23:41:35 -06:00
|
|
|
if (rc)
|
|
|
|
goto out;
|
|
|
|
fsstack_copy_attr_atime(dentry->d_inode,
|
|
|
|
ecryptfs_dentry_to_lower(dentry)->d_inode);
|
2012-05-03 07:34:20 -06:00
|
|
|
buf[len] = '\0';
|
2006-10-04 03:16:22 -06:00
|
|
|
out:
|
2010-01-11 11:36:14 -07:00
|
|
|
nd_set_link(nd, buf);
|
|
|
|
return NULL;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
|
|
|
|
{
|
2010-01-11 11:36:14 -07:00
|
|
|
char *buf = nd_get_link(nd);
|
|
|
|
if (!IS_ERR(buf)) {
|
|
|
|
/* Free the char* */
|
|
|
|
kfree(buf);
|
|
|
|
}
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* upper_size_to_lower_size
|
|
|
|
* @crypt_stat: Crypt_stat associated with file
|
|
|
|
* @upper_size: Size of the upper file
|
|
|
|
*
|
2008-02-06 02:38:32 -07:00
|
|
|
* Calculate the required size of the lower file based on the
|
2006-10-04 03:16:22 -06:00
|
|
|
* specified size of the upper file. This calculation is based on the
|
|
|
|
* number of headers in the underlying file and the extent size.
|
|
|
|
*
|
|
|
|
* Returns Calculated size of the lower file.
|
|
|
|
*/
|
|
|
|
static loff_t
|
|
|
|
upper_size_to_lower_size(struct ecryptfs_crypt_stat *crypt_stat,
|
|
|
|
loff_t upper_size)
|
|
|
|
{
|
|
|
|
loff_t lower_size;
|
|
|
|
|
2010-02-11 06:10:38 -07:00
|
|
|
lower_size = ecryptfs_lower_header_size(crypt_stat);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (upper_size != 0) {
|
|
|
|
loff_t num_extents;
|
|
|
|
|
|
|
|
num_extents = upper_size >> crypt_stat->extent_shift;
|
|
|
|
if (upper_size & ~crypt_stat->extent_mask)
|
|
|
|
num_extents++;
|
|
|
|
lower_size += (num_extents * crypt_stat->extent_size);
|
|
|
|
}
|
|
|
|
return lower_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2009-10-14 15:18:27 -06:00
|
|
|
* truncate_upper
|
2006-10-04 03:16:22 -06:00
|
|
|
* @dentry: The ecryptfs layer dentry
|
2009-10-14 15:18:27 -06:00
|
|
|
* @ia: Address of the ecryptfs inode's attributes
|
|
|
|
* @lower_ia: Address of the lower inode's attributes
|
2006-10-04 03:16:22 -06:00
|
|
|
*
|
|
|
|
* Function to handle truncations modifying the size of the file. Note
|
|
|
|
* that the file sizes are interpolated. When expanding, we are simply
|
2009-10-14 15:18:27 -06:00
|
|
|
* writing strings of 0's out. When truncating, we truncate the upper
|
|
|
|
* inode and update the lower_ia according to the page index
|
|
|
|
* interpolations. If ATTR_SIZE is set in lower_ia->ia_valid upon return,
|
|
|
|
* the caller must use lower_ia in a call to notify_change() to perform
|
|
|
|
* the truncation of the lower inode.
|
2006-10-04 03:16:22 -06:00
|
|
|
*
|
|
|
|
* Returns zero on success; non-zero otherwise
|
|
|
|
*/
|
2009-10-14 15:18:27 -06:00
|
|
|
static int truncate_upper(struct dentry *dentry, struct iattr *ia,
|
|
|
|
struct iattr *lower_ia)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
struct inode *inode = dentry->d_inode;
|
|
|
|
struct ecryptfs_crypt_stat *crypt_stat;
|
|
|
|
loff_t i_size = i_size_read(inode);
|
|
|
|
loff_t lower_size_before_truncate;
|
|
|
|
loff_t lower_size_after_truncate;
|
|
|
|
|
2009-10-14 15:18:27 -06:00
|
|
|
if (unlikely((ia->ia_size == i_size))) {
|
|
|
|
lower_ia->ia_valid &= ~ATTR_SIZE;
|
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
|
|
|
return 0;
|
2009-10-14 15:18:27 -06:00
|
|
|
}
|
2011-05-24 02:49:02 -06:00
|
|
|
rc = ecryptfs_get_lower_file(dentry, inode);
|
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
|
|
|
if (rc)
|
|
|
|
return rc;
|
2006-10-04 03:16:22 -06:00
|
|
|
crypt_stat = &ecryptfs_inode_to_private(dentry->d_inode)->crypt_stat;
|
|
|
|
/* Switch on growing or shrinking file */
|
2009-10-14 15:18:27 -06:00
|
|
|
if (ia->ia_size > i_size) {
|
2007-10-16 02:28:10 -06:00
|
|
|
char zero[] = { 0x00 };
|
|
|
|
|
2009-10-14 15:18:27 -06:00
|
|
|
lower_ia->ia_valid &= ~ATTR_SIZE;
|
2007-10-16 02:28:10 -06:00
|
|
|
/* Write a single 0 at the last position of the file;
|
|
|
|
* this triggers code that will fill in 0's throughout
|
|
|
|
* the intermediate portion of the previous end of the
|
|
|
|
* file and the new and of the file */
|
2010-05-21 09:09:58 -06:00
|
|
|
rc = ecryptfs_write(inode, zero,
|
2009-10-14 15:18:27 -06:00
|
|
|
(ia->ia_size - 1), 1);
|
|
|
|
} else { /* ia->ia_size < i_size_read(inode) */
|
|
|
|
/* We're chopping off all the pages down to the page
|
|
|
|
* in which ia->ia_size is located. Fill in the end of
|
|
|
|
* that page from (ia->ia_size & ~PAGE_CACHE_MASK) to
|
2007-10-16 02:28:10 -06:00
|
|
|
* PAGE_CACHE_SIZE with zeros. */
|
|
|
|
size_t num_zeros = (PAGE_CACHE_SIZE
|
2009-10-14 15:18:27 -06:00
|
|
|
- (ia->ia_size & ~PAGE_CACHE_MASK));
|
2007-10-16 02:28:10 -06:00
|
|
|
|
2009-04-13 14:29:27 -06:00
|
|
|
if (!(crypt_stat->flags & ECRYPTFS_ENCRYPTED)) {
|
2010-06-04 03:30:04 -06:00
|
|
|
truncate_setsize(inode, ia->ia_size);
|
2009-10-14 15:18:27 -06:00
|
|
|
lower_ia->ia_size = ia->ia_size;
|
|
|
|
lower_ia->ia_valid |= ATTR_SIZE;
|
2010-05-21 09:09:58 -06:00
|
|
|
goto out;
|
2009-04-13 14:29:27 -06:00
|
|
|
}
|
2007-10-16 02:28:10 -06:00
|
|
|
if (num_zeros) {
|
|
|
|
char *zeros_virt;
|
|
|
|
|
|
|
|
zeros_virt = kzalloc(num_zeros, GFP_KERNEL);
|
|
|
|
if (!zeros_virt) {
|
|
|
|
rc = -ENOMEM;
|
2010-05-21 09:09:58 -06:00
|
|
|
goto out;
|
2007-10-16 02:28:10 -06:00
|
|
|
}
|
2010-05-21 09:09:58 -06:00
|
|
|
rc = ecryptfs_write(inode, zeros_virt,
|
2009-10-14 15:18:27 -06:00
|
|
|
ia->ia_size, num_zeros);
|
2007-10-16 02:28:10 -06:00
|
|
|
kfree(zeros_virt);
|
2007-10-16 02:28:06 -06:00
|
|
|
if (rc) {
|
2007-06-27 15:09:44 -06:00
|
|
|
printk(KERN_ERR "Error attempting to zero out "
|
|
|
|
"the remainder of the end page on "
|
|
|
|
"reducing truncate; rc = [%d]\n", rc);
|
2010-05-21 09:09:58 -06:00
|
|
|
goto out;
|
2007-06-27 15:09:44 -06:00
|
|
|
}
|
|
|
|
}
|
2010-06-04 03:30:04 -06:00
|
|
|
truncate_setsize(inode, ia->ia_size);
|
2007-10-16 02:28:08 -06:00
|
|
|
rc = ecryptfs_write_inode_size_to_metadata(inode);
|
2007-02-12 01:53:46 -07:00
|
|
|
if (rc) {
|
|
|
|
printk(KERN_ERR "Problem with "
|
|
|
|
"ecryptfs_write_inode_size_to_metadata; "
|
|
|
|
"rc = [%d]\n", rc);
|
2010-05-21 09:09:58 -06:00
|
|
|
goto out;
|
2007-02-12 01:53:46 -07:00
|
|
|
}
|
2006-10-04 03:16:22 -06:00
|
|
|
/* We are reducing the size of the ecryptfs file, and need to
|
|
|
|
* know if we need to reduce the size of the lower file. */
|
|
|
|
lower_size_before_truncate =
|
|
|
|
upper_size_to_lower_size(crypt_stat, i_size);
|
|
|
|
lower_size_after_truncate =
|
2009-10-14 15:18:27 -06:00
|
|
|
upper_size_to_lower_size(crypt_stat, ia->ia_size);
|
|
|
|
if (lower_size_after_truncate < lower_size_before_truncate) {
|
|
|
|
lower_ia->ia_size = lower_size_after_truncate;
|
|
|
|
lower_ia->ia_valid |= ATTR_SIZE;
|
|
|
|
} else
|
|
|
|
lower_ia->ia_valid &= ~ATTR_SIZE;
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
out:
|
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
|
|
|
ecryptfs_put_lower_file(inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
eCryptfs: Check inode changes in setattr
Most filesystems call inode_change_ok() very early in ->setattr(), but
eCryptfs didn't call it at all. It allowed the lower filesystem to make
the call in its ->setattr() function. Then, eCryptfs would copy the
appropriate inode attributes from the lower inode to the eCryptfs inode.
This patch changes that and actually calls inode_change_ok() on the
eCryptfs inode, fairly early in ecryptfs_setattr(). Ideally, the call
would happen earlier in ecryptfs_setattr(), but there are some possible
inode initialization steps that must happen first.
Since the call was already being made on the lower inode, the change in
functionality should be minimal, except for the case of a file extending
truncate call. In that case, inode_newsize_ok() was never being
called on the eCryptfs inode. Rather than inode_newsize_ok() catching
maximum file size errors early on, eCryptfs would encrypt zeroed pages
and write them to the lower filesystem until the lower filesystem's
write path caught the error in generic_write_checks(). This patch
introduces a new function, called ecryptfs_inode_newsize_ok(), which
checks if the new lower file size is within the appropriate limits when
the truncate operation will be growing the lower file.
In summary this change prevents eCryptfs truncate operations (and the
resulting page encryptions), which would exceed the lower filesystem
limits or FSIZE rlimits, from ever starting.
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reviewed-by: Li Wang <liwang@nudt.edu.cn>
Cc: <stable@vger.kernel.org>
2012-01-19 19:33:44 -07:00
|
|
|
static int ecryptfs_inode_newsize_ok(struct inode *inode, loff_t offset)
|
|
|
|
{
|
|
|
|
struct ecryptfs_crypt_stat *crypt_stat;
|
|
|
|
loff_t lower_oldsize, lower_newsize;
|
|
|
|
|
|
|
|
crypt_stat = &ecryptfs_inode_to_private(inode)->crypt_stat;
|
|
|
|
lower_oldsize = upper_size_to_lower_size(crypt_stat,
|
|
|
|
i_size_read(inode));
|
|
|
|
lower_newsize = upper_size_to_lower_size(crypt_stat, offset);
|
|
|
|
if (lower_newsize > lower_oldsize) {
|
|
|
|
/*
|
|
|
|
* The eCryptfs inode and the new *lower* size are mixed here
|
|
|
|
* because we may not have the lower i_mutex held and/or it may
|
|
|
|
* not be appropriate to call inode_newsize_ok() with inodes
|
|
|
|
* from other filesystems.
|
|
|
|
*/
|
|
|
|
return inode_newsize_ok(inode, lower_newsize);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-10-14 15:18:27 -06:00
|
|
|
/**
|
|
|
|
* ecryptfs_truncate
|
|
|
|
* @dentry: The ecryptfs layer dentry
|
|
|
|
* @new_length: The length to expand the file to
|
|
|
|
*
|
|
|
|
* Simple function that handles the truncation of an eCryptfs inode and
|
|
|
|
* its corresponding lower inode.
|
|
|
|
*
|
|
|
|
* Returns zero on success; non-zero otherwise
|
|
|
|
*/
|
|
|
|
int ecryptfs_truncate(struct dentry *dentry, loff_t new_length)
|
|
|
|
{
|
|
|
|
struct iattr ia = { .ia_valid = ATTR_SIZE, .ia_size = new_length };
|
|
|
|
struct iattr lower_ia = { .ia_valid = 0 };
|
|
|
|
int rc;
|
|
|
|
|
eCryptfs: Check inode changes in setattr
Most filesystems call inode_change_ok() very early in ->setattr(), but
eCryptfs didn't call it at all. It allowed the lower filesystem to make
the call in its ->setattr() function. Then, eCryptfs would copy the
appropriate inode attributes from the lower inode to the eCryptfs inode.
This patch changes that and actually calls inode_change_ok() on the
eCryptfs inode, fairly early in ecryptfs_setattr(). Ideally, the call
would happen earlier in ecryptfs_setattr(), but there are some possible
inode initialization steps that must happen first.
Since the call was already being made on the lower inode, the change in
functionality should be minimal, except for the case of a file extending
truncate call. In that case, inode_newsize_ok() was never being
called on the eCryptfs inode. Rather than inode_newsize_ok() catching
maximum file size errors early on, eCryptfs would encrypt zeroed pages
and write them to the lower filesystem until the lower filesystem's
write path caught the error in generic_write_checks(). This patch
introduces a new function, called ecryptfs_inode_newsize_ok(), which
checks if the new lower file size is within the appropriate limits when
the truncate operation will be growing the lower file.
In summary this change prevents eCryptfs truncate operations (and the
resulting page encryptions), which would exceed the lower filesystem
limits or FSIZE rlimits, from ever starting.
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reviewed-by: Li Wang <liwang@nudt.edu.cn>
Cc: <stable@vger.kernel.org>
2012-01-19 19:33:44 -07:00
|
|
|
rc = ecryptfs_inode_newsize_ok(dentry->d_inode, new_length);
|
|
|
|
if (rc)
|
|
|
|
return rc;
|
|
|
|
|
2009-10-14 15:18:27 -06:00
|
|
|
rc = truncate_upper(dentry, &ia, &lower_ia);
|
|
|
|
if (!rc && lower_ia.ia_valid & ATTR_SIZE) {
|
|
|
|
struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
|
|
|
|
mutex_lock(&lower_dentry->d_inode->i_mutex);
|
|
|
|
rc = notify_change(lower_dentry, &lower_ia);
|
|
|
|
mutex_unlock(&lower_dentry->d_inode->i_mutex);
|
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2006-10-04 03:16:22 -06:00
|
|
|
static int
|
2011-06-20 17:28:19 -06:00
|
|
|
ecryptfs_permission(struct inode *inode, int mask)
|
2006-10-04 03:16:22 -06:00
|
|
|
{
|
2008-07-21 22:07:17 -06:00
|
|
|
return inode_permission(ecryptfs_inode_to_lower(inode), mask);
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* ecryptfs_setattr
|
|
|
|
* @dentry: dentry handle to the inode to modify
|
|
|
|
* @ia: Structure with flags of what to change and values
|
|
|
|
*
|
|
|
|
* Updates the metadata of an inode. If the update is to the size
|
|
|
|
* i.e. truncation, then ecryptfs_truncate will handle the size modification
|
|
|
|
* of both the ecryptfs inode and the lower inode.
|
|
|
|
*
|
|
|
|
* All other metadata changes will be passed right to the lower filesystem,
|
|
|
|
* and we will just update our inode to look like the lower.
|
|
|
|
*/
|
|
|
|
static int ecryptfs_setattr(struct dentry *dentry, struct iattr *ia)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
struct dentry *lower_dentry;
|
2009-10-14 15:18:27 -06:00
|
|
|
struct iattr lower_ia;
|
2006-10-04 03:16:22 -06:00
|
|
|
struct inode *inode;
|
|
|
|
struct inode *lower_inode;
|
|
|
|
struct ecryptfs_crypt_stat *crypt_stat;
|
|
|
|
|
|
|
|
crypt_stat = &ecryptfs_inode_to_private(dentry->d_inode)->crypt_stat;
|
2007-06-27 15:09:44 -06:00
|
|
|
if (!(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED))
|
|
|
|
ecryptfs_init_crypt_stat(crypt_stat);
|
2006-10-04 03:16:22 -06:00
|
|
|
inode = dentry->d_inode;
|
|
|
|
lower_inode = ecryptfs_inode_to_lower(inode);
|
2007-06-27 15:09:44 -06:00
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
mutex_lock(&crypt_stat->cs_mutex);
|
|
|
|
if (S_ISDIR(dentry->d_inode->i_mode))
|
|
|
|
crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
|
2007-07-19 02:47:54 -06:00
|
|
|
else if (S_ISREG(dentry->d_inode->i_mode)
|
|
|
|
&& (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
|
|
|
|
|| !(crypt_stat->flags & ECRYPTFS_KEY_VALID))) {
|
2007-06-27 15:09:44 -06:00
|
|
|
struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
|
|
|
|
|
|
|
|
mount_crypt_stat = &ecryptfs_superblock_to_private(
|
|
|
|
dentry->d_sb)->mount_crypt_stat;
|
2011-05-24 02:49:02 -06:00
|
|
|
rc = ecryptfs_get_lower_file(dentry, inode);
|
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
|
|
|
if (rc) {
|
|
|
|
mutex_unlock(&crypt_stat->cs_mutex);
|
|
|
|
goto out;
|
|
|
|
}
|
2007-10-16 02:28:10 -06:00
|
|
|
rc = ecryptfs_read_metadata(dentry);
|
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
|
|
|
ecryptfs_put_lower_file(inode);
|
2007-10-16 02:28:06 -06:00
|
|
|
if (rc) {
|
2007-06-27 15:09:44 -06:00
|
|
|
if (!(mount_crypt_stat->flags
|
|
|
|
& ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED)) {
|
|
|
|
rc = -EIO;
|
2008-02-06 02:38:35 -07:00
|
|
|
printk(KERN_WARNING "Either the lower file "
|
2007-06-27 15:09:44 -06:00
|
|
|
"is not in a valid eCryptfs format, "
|
2008-02-06 02:38:35 -07:00
|
|
|
"or the key could not be retrieved. "
|
|
|
|
"Plaintext passthrough mode is not "
|
2007-06-27 15:09:44 -06:00
|
|
|
"enabled; returning -EIO\n");
|
|
|
|
mutex_unlock(&crypt_stat->cs_mutex);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
rc = 0;
|
2011-03-15 13:54:00 -06:00
|
|
|
crypt_stat->flags &= ~(ECRYPTFS_I_SIZE_INITIALIZED
|
|
|
|
| ECRYPTFS_ENCRYPTED);
|
2007-06-27 15:09:44 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
mutex_unlock(&crypt_stat->cs_mutex);
|
eCryptfs: Check inode changes in setattr
Most filesystems call inode_change_ok() very early in ->setattr(), but
eCryptfs didn't call it at all. It allowed the lower filesystem to make
the call in its ->setattr() function. Then, eCryptfs would copy the
appropriate inode attributes from the lower inode to the eCryptfs inode.
This patch changes that and actually calls inode_change_ok() on the
eCryptfs inode, fairly early in ecryptfs_setattr(). Ideally, the call
would happen earlier in ecryptfs_setattr(), but there are some possible
inode initialization steps that must happen first.
Since the call was already being made on the lower inode, the change in
functionality should be minimal, except for the case of a file extending
truncate call. In that case, inode_newsize_ok() was never being
called on the eCryptfs inode. Rather than inode_newsize_ok() catching
maximum file size errors early on, eCryptfs would encrypt zeroed pages
and write them to the lower filesystem until the lower filesystem's
write path caught the error in generic_write_checks(). This patch
introduces a new function, called ecryptfs_inode_newsize_ok(), which
checks if the new lower file size is within the appropriate limits when
the truncate operation will be growing the lower file.
In summary this change prevents eCryptfs truncate operations (and the
resulting page encryptions), which would exceed the lower filesystem
limits or FSIZE rlimits, from ever starting.
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Reviewed-by: Li Wang <liwang@nudt.edu.cn>
Cc: <stable@vger.kernel.org>
2012-01-19 19:33:44 -07:00
|
|
|
|
|
|
|
rc = inode_change_ok(inode, ia);
|
|
|
|
if (rc)
|
|
|
|
goto out;
|
|
|
|
if (ia->ia_valid & ATTR_SIZE) {
|
|
|
|
rc = ecryptfs_inode_newsize_ok(inode, ia->ia_size);
|
|
|
|
if (rc)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-10-14 15:18:27 -06:00
|
|
|
memcpy(&lower_ia, ia, sizeof(lower_ia));
|
|
|
|
if (ia->ia_valid & ATTR_FILE)
|
|
|
|
lower_ia.ia_file = ecryptfs_file_to_lower(ia->ia_file);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (ia->ia_valid & ATTR_SIZE) {
|
2009-10-14 15:18:27 -06:00
|
|
|
rc = truncate_upper(dentry, ia, &lower_ia);
|
2006-10-04 03:16:22 -06:00
|
|
|
if (rc < 0)
|
|
|
|
goto out;
|
|
|
|
}
|
2007-10-18 04:05:17 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* mode change is for clearing setuid/setgid bits. Allow lower fs
|
|
|
|
* to interpret this in its own way.
|
|
|
|
*/
|
2009-10-14 15:18:27 -06:00
|
|
|
if (lower_ia.ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
|
|
|
|
lower_ia.ia_valid &= ~ATTR_MODE;
|
2007-10-18 04:05:17 -06:00
|
|
|
|
2008-04-29 01:59:48 -06:00
|
|
|
mutex_lock(&lower_dentry->d_inode->i_mutex);
|
2009-10-14 15:18:27 -06:00
|
|
|
rc = notify_change(lower_dentry, &lower_ia);
|
2008-04-29 01:59:48 -06:00
|
|
|
mutex_unlock(&lower_dentry->d_inode->i_mutex);
|
2006-10-04 03:16:22 -06:00
|
|
|
out:
|
2009-12-02 17:51:54 -07:00
|
|
|
fsstack_copy_attr_all(inode, lower_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-03-21 23:41:35 -06:00
|
|
|
int ecryptfs_getattr_link(struct vfsmount *mnt, struct dentry *dentry,
|
|
|
|
struct kstat *stat)
|
|
|
|
{
|
|
|
|
struct ecryptfs_mount_crypt_stat *mount_crypt_stat;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
mount_crypt_stat = &ecryptfs_superblock_to_private(
|
|
|
|
dentry->d_sb)->mount_crypt_stat;
|
|
|
|
generic_fillattr(dentry->d_inode, stat);
|
|
|
|
if (mount_crypt_stat->flags & ECRYPTFS_GLOBAL_ENCRYPT_FILENAMES) {
|
|
|
|
char *target;
|
|
|
|
size_t targetsiz;
|
|
|
|
|
|
|
|
rc = ecryptfs_readlink_lower(dentry, &target, &targetsiz);
|
|
|
|
if (!rc) {
|
|
|
|
kfree(target);
|
|
|
|
stat->size = targetsiz;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2009-11-04 01:48:01 -07:00
|
|
|
int ecryptfs_getattr(struct vfsmount *mnt, struct dentry *dentry,
|
|
|
|
struct kstat *stat)
|
|
|
|
{
|
|
|
|
struct kstat lower_stat;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = vfs_getattr(ecryptfs_dentry_to_lower_mnt(dentry),
|
|
|
|
ecryptfs_dentry_to_lower(dentry), &lower_stat);
|
|
|
|
if (!rc) {
|
2011-01-11 11:43:42 -07:00
|
|
|
fsstack_copy_attr_all(dentry->d_inode,
|
|
|
|
ecryptfs_inode_to_lower(dentry->d_inode));
|
2009-11-04 01:48:01 -07:00
|
|
|
generic_fillattr(dentry->d_inode, stat);
|
|
|
|
stat->blocks = lower_stat.blocks;
|
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2007-02-12 01:53:46 -07:00
|
|
|
int
|
2006-10-04 03:16:22 -06:00
|
|
|
ecryptfs_setxattr(struct dentry *dentry, const char *name, const void *value,
|
|
|
|
size_t size, int flags)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
struct dentry *lower_dentry;
|
|
|
|
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
if (!lower_dentry->d_inode->i_op->setxattr) {
|
2010-03-23 10:51:38 -06:00
|
|
|
rc = -EOPNOTSUPP;
|
2006-10-04 03:16:22 -06:00
|
|
|
goto out;
|
|
|
|
}
|
2010-10-05 10:53:45 -06:00
|
|
|
|
|
|
|
rc = vfs_setxattr(lower_dentry, name, value, size, flags);
|
2012-02-07 16:55:40 -07:00
|
|
|
if (!rc)
|
|
|
|
fsstack_copy_attr_all(dentry->d_inode, lower_dentry->d_inode);
|
2006-10-04 03:16:22 -06:00
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2007-10-16 02:28:10 -06:00
|
|
|
ssize_t
|
|
|
|
ecryptfs_getxattr_lower(struct dentry *lower_dentry, const char *name,
|
|
|
|
void *value, size_t size)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
if (!lower_dentry->d_inode->i_op->getxattr) {
|
2010-03-23 10:51:38 -06:00
|
|
|
rc = -EOPNOTSUPP;
|
2007-10-16 02:28:10 -06:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
mutex_lock(&lower_dentry->d_inode->i_mutex);
|
|
|
|
rc = lower_dentry->d_inode->i_op->getxattr(lower_dentry, name, value,
|
|
|
|
size);
|
|
|
|
mutex_unlock(&lower_dentry->d_inode->i_mutex);
|
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2008-02-06 02:38:32 -07:00
|
|
|
static ssize_t
|
2006-10-04 03:16:22 -06:00
|
|
|
ecryptfs_getxattr(struct dentry *dentry, const char *name, void *value,
|
|
|
|
size_t size)
|
|
|
|
{
|
2007-10-16 02:28:10 -06:00
|
|
|
return ecryptfs_getxattr_lower(ecryptfs_dentry_to_lower(dentry), name,
|
|
|
|
value, size);
|
2006-10-04 03:16:22 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t
|
|
|
|
ecryptfs_listxattr(struct dentry *dentry, char *list, size_t size)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
struct dentry *lower_dentry;
|
|
|
|
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
if (!lower_dentry->d_inode->i_op->listxattr) {
|
2010-03-23 10:51:38 -06:00
|
|
|
rc = -EOPNOTSUPP;
|
2006-10-04 03:16:22 -06:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
mutex_lock(&lower_dentry->d_inode->i_mutex);
|
|
|
|
rc = lower_dentry->d_inode->i_op->listxattr(lower_dentry, list, size);
|
|
|
|
mutex_unlock(&lower_dentry->d_inode->i_mutex);
|
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ecryptfs_removexattr(struct dentry *dentry, const char *name)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
struct dentry *lower_dentry;
|
|
|
|
|
|
|
|
lower_dentry = ecryptfs_dentry_to_lower(dentry);
|
|
|
|
if (!lower_dentry->d_inode->i_op->removexattr) {
|
2010-03-23 10:51:38 -06:00
|
|
|
rc = -EOPNOTSUPP;
|
2006-10-04 03:16:22 -06:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
mutex_lock(&lower_dentry->d_inode->i_mutex);
|
|
|
|
rc = lower_dentry->d_inode->i_op->removexattr(lower_dentry, name);
|
|
|
|
mutex_unlock(&lower_dentry->d_inode->i_mutex);
|
|
|
|
out:
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2007-02-12 01:55:38 -07:00
|
|
|
const struct inode_operations ecryptfs_symlink_iops = {
|
2012-05-03 07:34:20 -06:00
|
|
|
.readlink = generic_readlink,
|
2006-10-04 03:16:22 -06:00
|
|
|
.follow_link = ecryptfs_follow_link,
|
|
|
|
.put_link = ecryptfs_put_link,
|
|
|
|
.permission = ecryptfs_permission,
|
|
|
|
.setattr = ecryptfs_setattr,
|
2010-03-21 23:41:35 -06:00
|
|
|
.getattr = ecryptfs_getattr_link,
|
2006-10-04 03:16:22 -06:00
|
|
|
.setxattr = ecryptfs_setxattr,
|
|
|
|
.getxattr = ecryptfs_getxattr,
|
|
|
|
.listxattr = ecryptfs_listxattr,
|
|
|
|
.removexattr = ecryptfs_removexattr
|
|
|
|
};
|
|
|
|
|
2007-02-12 01:55:38 -07:00
|
|
|
const struct inode_operations ecryptfs_dir_iops = {
|
2006-10-04 03:16:22 -06:00
|
|
|
.create = ecryptfs_create,
|
|
|
|
.lookup = ecryptfs_lookup,
|
|
|
|
.link = ecryptfs_link,
|
|
|
|
.unlink = ecryptfs_unlink,
|
|
|
|
.symlink = ecryptfs_symlink,
|
|
|
|
.mkdir = ecryptfs_mkdir,
|
|
|
|
.rmdir = ecryptfs_rmdir,
|
|
|
|
.mknod = ecryptfs_mknod,
|
|
|
|
.rename = ecryptfs_rename,
|
|
|
|
.permission = ecryptfs_permission,
|
|
|
|
.setattr = ecryptfs_setattr,
|
|
|
|
.setxattr = ecryptfs_setxattr,
|
|
|
|
.getxattr = ecryptfs_getxattr,
|
|
|
|
.listxattr = ecryptfs_listxattr,
|
|
|
|
.removexattr = ecryptfs_removexattr
|
|
|
|
};
|
|
|
|
|
2007-02-12 01:55:38 -07:00
|
|
|
const struct inode_operations ecryptfs_main_iops = {
|
2006-10-04 03:16:22 -06:00
|
|
|
.permission = ecryptfs_permission,
|
|
|
|
.setattr = ecryptfs_setattr,
|
2009-11-04 01:48:01 -07:00
|
|
|
.getattr = ecryptfs_getattr,
|
2006-10-04 03:16:22 -06:00
|
|
|
.setxattr = ecryptfs_setxattr,
|
|
|
|
.getxattr = ecryptfs_getxattr,
|
|
|
|
.listxattr = ecryptfs_listxattr,
|
|
|
|
.removexattr = ecryptfs_removexattr
|
|
|
|
};
|