From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Andreas Gruenbacher <agruenba@redhat.com>,
"J. Bruce Fields" <bfields@redhat.com>
Subject: linux-next: manual merge of the userns tree with Linus' tree
Date: Fri, 8 Jul 2016 16:13:13 +1000 [thread overview]
Message-ID: <20160708161313.796f341a@canb.auug.org.au> (raw)
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in:
fs/posix_acl.c
between commit:
485e71e8fb63 ("posix_acl: Add set_posix_acl")
from Linus' tree and commit:
0d4d717f2583 ("vfs: Verify acls are valid within superblock's s_user_ns.")
from the userns tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc fs/posix_acl.c
index edc452c2a563,647c28180675..000000000000
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@@ -833,24 -839,6 +833,24 @@@ set_posix_acl(struct inode *inode, int
if (!inode_owner_or_capable(inode))
return -EPERM;
+ if (acl) {
- int ret = posix_acl_valid(acl);
++ int ret = posix_acl_valid(inode->i_sb->s_user_ns, acl);
+ if (ret)
+ return ret;
+ }
+ return inode->i_op->set_acl(inode, acl, type);
+}
+EXPORT_SYMBOL(set_posix_acl);
+
+static int
+posix_acl_xattr_set(const struct xattr_handler *handler,
+ struct dentry *unused, struct inode *inode,
+ const char *name, const void *value,
+ size_t size, int flags)
+{
+ struct posix_acl *acl = NULL;
+ int ret;
+
if (value) {
acl = posix_acl_from_xattr(&init_user_ns, value, size);
if (IS_ERR(acl))
next reply other threads:[~2016-07-08 6:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-08 6:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-25 8:22 linux-next: manual merge of the userns tree with Linus' tree Stephen Rothwell
2021-06-28 7:16 ` Stephen Rothwell
2021-05-26 4:51 Stephen Rothwell
2021-05-26 4:38 Stephen Rothwell
2021-05-26 4:32 Stephen Rothwell
2016-11-22 8:17 Stephen Rothwell
2016-11-22 17:44 ` Eric W. Biederman
2016-11-22 22:56 ` Stephen Rothwell
2016-06-24 4:41 Stephen Rothwell
2014-04-17 5:06 Stephen Rothwell
2014-04-17 5:25 ` Al Viro
2014-04-17 8:44 ` Eric W. Biederman
2014-04-22 1:37 ` Stephen Rothwell
2014-04-09 2:45 Stephen Rothwell
2014-04-09 2:40 Stephen Rothwell
2014-04-09 2:39 Stephen Rothwell
2012-05-22 7:44 Stephen Rothwell
2012-05-22 14:29 ` Eric W. Biederman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160708161313.796f341a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agruenba@redhat.com \
--cc=bfields@redhat.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).