From 7672c9a15a4abf00cf1fbf176b94ee96b9edf5be Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Sun, 25 Nov 2007 23:01:28 -0500 Subject: [PATCH] Unionfs: create opaque directories' whiteouts unconditionally Needed to maintain Unix semantics (LTP testing). Signed-off-by: Erez Zadok --- fs/unionfs/subr.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fs/unionfs/subr.c b/fs/unionfs/subr.c index 968ee8c6784..1a26c57dff2 100644 --- a/fs/unionfs/subr.c +++ b/fs/unionfs/subr.c @@ -162,6 +162,19 @@ int make_dir_opaque(struct dentry *dentry, int bindex) struct dentry *lower_dentry, *diropq; struct inode *lower_dir; struct nameidata nd; + kernel_cap_t orig_cap; + + /* + * Opaque directory whiteout markers are special files (like regular + * whiteouts), and should appear to the users as if they don't + * exist. They should be created/deleted regardless of directory + * search/create permissions, but only for the duration of this + * creation of the .wh.__dir_opaque: file. Note, this does not + * circumvent normal ->permission). + */ + orig_cap = current->cap_effective; + cap_raise(current->cap_effective, CAP_DAC_READ_SEARCH); + cap_raise(current->cap_effective, CAP_DAC_OVERRIDE); lower_dentry = unionfs_lower_dentry_idx(dentry, bindex); lower_dir = lower_dentry->d_inode; @@ -189,6 +202,7 @@ int make_dir_opaque(struct dentry *dentry, int bindex) out: mutex_unlock(&lower_dir->i_mutex); + current->cap_effective = orig_cap; return err; } -- 2.34.1