diff options
| author | Serge E. Hallyn <serge.hallyn@canonical.com> | 2011-08-04 17:06:02 -0500 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@aristanetworks.com> | 2011-08-11 10:07:52 -0500 |
| commit | 27ede6b60ccee337d702c7fe8eea311495391df7 (patch) | |
| tree | 8389fcba66ae8db098679d6419c9ded4aba36779 | |
| parent | 1387c192973857371987755570894fe106711677 (diff) | |
| download | linux-user-ns-devel-27ede6b60ccee337d702c7fe8eea311495391df7.tar.gz | |
net/core/scm.c: target capable() calls to user_ns owning the net_ns
Quoting Serge Hallyn (serge@hallyn.com):
> From: Serge E. Hallyn <serge.hallyn@canonical.com>
>
> The uid/gid comparisons don't have to be pulled out. This just seemed
> more easily proved correct.
The following needs to be folded into this patch:
From: Serge Hallyn <serge.hallyn@canonical.com>
Date: Thu, 4 Aug 2011 21:48:13 +0000
Subject: [PATCH 2/2] fold up - net/core/scm.c: cred is const
Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com>
| -rw-r--r-- | net/core/scm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/scm.c b/net/core/scm.c index 21b5d0bed96ad..528fa36aa163a 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -43,7 +43,7 @@ * setu(g)id. */ -static __inline__ bool uidequiv(struct cred *src, struct ucred *tgt, +static __inline__ bool uidequiv(const struct cred *src, struct ucred *tgt, struct user_namespace *ns) { if (src->user_ns != ns) @@ -57,7 +57,7 @@ check_capable: return false; } -static __inline__ bool gidequiv(struct cred *src, struct ucred *tgt, +static __inline__ bool gidequiv(const struct cred *src, struct ucred *tgt, struct user_namespace *ns) { if (src->user_ns != ns) |