From mboxrd@z Thu Jan 1 00:00:00 1970 From: ebiederm@xmission.com (Eric W. Biederman) Subject: Re: [PATCH 04/13] overlay filesystem Date: Wed, 15 Aug 2012 23:24:48 -0700 Message-ID: <87zk5v5p73.fsf@xmission.com> References: <1345045700-9062-1-git-send-email-miklos@szeredi.hu> <1345045700-9062-5-git-send-email-miklos@szeredi.hu> Mime-Version: 1.0 Content-Type: text/plain Cc: viro@ZenIV.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, hch@infradead.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, apw@canonical.com, nbd@openwrt.org, neilb@suse.de, hramrach@centrum.cz, jordipujolp@gmail.com, ezk@fsl.cs.sunysb.edu, ricwheeler@gmail.com, dhowells@redhat.com, hpj@urpla.net, sedat.dilek@googlemail.com, penberg@kernel.org, goran.cetusic@gmail.com, romain@orebokech.com, mszeredi@suse.cz To: Miklos Szeredi Return-path: In-Reply-To: <1345045700-9062-5-git-send-email-miklos@szeredi.hu> (Miklos Szeredi's message of "Wed, 15 Aug 2012 17:48:11 +0200") Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Miklos Szeredi writes: Minor nits below. > diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c > new file mode 100644 > index 0000000..6b50823 > --- /dev/null > +++ b/fs/overlayfs/dir.c > @@ -0,0 +1,598 @@ > +/* > + * > + * Copyright (C) 2011 Novell Inc. > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2 as published by > + * the Free Software Foundation. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include "overlayfs.h" > + > +static const char *ovl_whiteout_symlink = "(overlay-whiteout)"; > + > +static int ovl_whiteout(struct dentry *upperdir, struct dentry *dentry) > +{ > + int err; > + struct dentry *newdentry; > + const struct cred *old_cred; > + struct cred *override_cred; > + > + /* FIXME: recheck lower dentry to see if whiteout is really > needed */ Is that FIXME still valid? > + err = -ENOMEM; > + override_cred = prepare_creds(); > + if (!override_cred) > + goto out; > + > + /* > + * CAP_SYS_ADMIN for setxattr > + * CAP_DAC_OVERRIDE for symlink creation > + * CAP_FOWNER for unlink in sticky directory > + */ > + cap_raise(override_cred->cap_effective, CAP_SYS_ADMIN); > + cap_raise(override_cred->cap_effective, CAP_DAC_OVERRIDE); > + cap_raise(override_cred->cap_effective, CAP_FOWNER); > + override_cred->fsuid = 0; > + override_cred->fsgid = 0; Could you please make these GLOBAL_ROOT_UID and GLOBAL_ROOT_GID instead of 0? Otherwise this code won't compile with the usernamespace bits enabled. > + old_cred = override_creds(override_cred); Eric