From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: build failure after merge of the userns tree
Date: Mon, 21 May 2012 16:05:16 -0600 [thread overview]
Message-ID: <87pq9x6vhf.fsf@xmission.com> (raw)
In-Reply-To: <20120521175009.7bd4948c026d8acc61f26753@canb.auug.org.au> (Stephen Rothwell's message of "Mon, 21 May 2012 17:50:09 +1000")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Eric,
>
> After merging the userns tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> kernel/sched/numa.c: In function 'ng_allowed':
> kernel/sched/numa.c:1270:16: error: 'struct user_struct' has no member named 'user_ns'
> kernel/sched/numa.c:1270:40: error: 'struct user_struct' has no member named 'user_ns'
> kernel/sched/numa.c:1278:28: error: 'struct user_struct' has no member named 'user_ns'
>
> Caused by commit a2dae61eb839 ("sched/numa: Introduce sys_numa_{t,m}bind
> ()") from the tip tree interacting with commit d0bd6594e286 ("userns:
> Deprecate and rename the user_namespace reference in the user_struct")
> from the userns tree.
>
> I applied this merge fix up patch (more may be required):
The fix is right.
Peter Zijlstra, or Ingo any chance you could add the patch below to your
tree?
It is just a better idiom to access the user namespace pointer as
cred->user_ns, instead of cred->user->user_ns and has been for a few
kernel releases.
Once my usernamespace tree is merged into Linus's tree a little more
will be needed to build this code with user namespaces enabled, but
cred->user->user to cred->user_ns is an improvement whichever way
you look at it.
Otherwise I guess this merge failure will act as a reminder that this
code needs a few more changes.
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 21 May 2012 17:40:55 +1000
> Subject: [PATCH] userns: fix up for user_ns move to struct cred
>
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> kernel/sched/numa.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/sched/numa.c b/kernel/sched/numa.c
> index 8eb92f7..1149993 100644
> --- a/kernel/sched/numa.c
> +++ b/kernel/sched/numa.c
> @@ -1267,7 +1267,7 @@ static int ng_allowed(struct numa_group *ng, struct task_struct *p)
>
> rcu_read_lock();
> tcred = __task_cred(p);
> - if (cred->user->user_ns == tcred->user->user_ns &&
> + if (cred->user_ns == tcred->user_ns &&
> (cred->uid == tcred->euid &&
> cred->uid == tcred->suid &&
> cred->uid == tcred->uid &&
> @@ -1275,7 +1275,7 @@ static int ng_allowed(struct numa_group *ng, struct task_struct *p)
> cred->gid == tcred->sgid &&
> cred->gid == tcred->gid))
> goto ok;
> - if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
> + if (ns_capable(tcred->user_ns, CAP_SYS_PTRACE))
> goto ok;
> rcu_read_unlock();
> return -EPERM;
> --
> 1.7.10.280.gaa39
next prev parent reply other threads:[~2012-05-21 22:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-21 7:50 linux-next: build failure after merge of the userns tree Stephen Rothwell
2012-05-21 22:05 ` Eric W. Biederman [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-16 5:56 Stephen Rothwell
2022-03-16 13:54 ` Eric W. Biederman
2021-12-17 7:34 Stephen Rothwell
2021-12-17 16:53 ` Eric W. Biederman
2021-12-17 7:13 Stephen Rothwell
2021-10-20 3:46 Stephen Rothwell
2021-10-20 16:00 ` Eric W. Biederman
2021-10-07 3:47 Stephen Rothwell
2021-10-07 18:56 ` Eric W. Biederman
2020-05-21 8:22 Stephen Rothwell
2018-03-28 7:41 Stephen Rothwell
2018-03-28 18:32 ` Eric W. Biederman
2018-01-26 1:05 Stephen Rothwell
2018-01-26 2:45 ` Eric W. Biederman
2017-07-20 3:25 Stephen Rothwell
2017-07-20 12:17 ` Eric W. Biederman
2015-05-25 10:39 Stephen Rothwell
2014-04-17 5:12 Stephen Rothwell
2014-04-17 7:18 ` Eric W. Biederman
2014-04-22 1:34 ` Stephen Rothwell
2013-11-08 7:07 Stephen Rothwell
2013-11-08 23:15 ` Eric W. Biederman
2013-11-11 5:25 ` Stephen Rothwell
2013-11-08 6:58 Stephen Rothwell
2013-11-08 7:27 ` Christoph Hellwig
2013-11-08 15:55 ` Al Viro
2013-11-08 22:50 ` Eric W. Biederman
2013-11-09 8:32 ` Christoph Hellwig
2012-09-24 12:18 Stephen Rothwell
2012-05-14 9:13 Stephen Rothwell
2012-05-16 1:12 ` 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=87pq9x6vhf.fsf@xmission.com \
--to=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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).