FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-13 20:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

userns: xt_owner: Add basic user namespace support.

Browse Source 
- Only allow adding matches from the initial user namespace
- Add the appropriate conversion functions to handle matches
  against sockets in other user namespaces.

Cc: Jan Engelhardt <jengelh@medozas.de>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2012-02-02 17:33:59 -08:00
parent da7428080a
commit 26711a791e
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init/Kconfig
View File

@ -943,7 +943,6 @@ config UIDGID_CONVERTED
# Networking # Networking
depends on NET_9P = n depends on NET_9P = n
depends on NETFILTER_XT_MATCH_OWNER = n
depends on AF_RXRPC = n depends on AF_RXRPC = n
depends on NET_KEY = n depends on NET_KEY = n
depends on DNS_RESOLVER = n depends on DNS_RESOLVER = n

30
net/netfilter/xt_owner.c
View File

@ -17,6 +17,17 @@
#include <linux/netfilter/x_tables.h> #include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_owner.h> #include <linux/netfilter/xt_owner.h>
static int owner_check(const struct xt_mtchk_param *par)
{
struct xt_owner_match_info *info = par->matchinfo;
/* For now only allow adding matches from the initial user namespace */
if ((info->match & (XT_OWNER_UID|XT_OWNER_GID)) &&
(current_user_ns() != &init_user_ns))
return -EINVAL;
return 0;
}
static bool static bool
owner_mt(const struct sk_buff *skb, struct xt_action_param *par) owner_mt(const struct sk_buff *skb, struct xt_action_param *par)
{ {
@ -37,17 +48,23 @@ owner_mt(const struct sk_buff *skb, struct xt_action_param *par)
return ((info->match ^ info->invert) & return ((info->match ^ info->invert) &
(XT_OWNER_UID | XT_OWNER_GID)) == 0; (XT_OWNER_UID | XT_OWNER_GID)) == 0;
if (info->match & XT_OWNER_UID) if (info->match & XT_OWNER_UID) {
if ((filp->f_cred->fsuid >= info->uid_min && kuid_t uid_min = make_kuid(&init_user_ns, info->uid_min);
filp->f_cred->fsuid <= info->uid_max) ^ kuid_t uid_max = make_kuid(&init_user_ns, info->uid_max);
if ((uid_gte(filp->f_cred->fsuid, uid_min) &&
uid_lte(filp->f_cred->fsuid, uid_max)) ^
!(info->invert & XT_OWNER_UID)) !(info->invert & XT_OWNER_UID))
return false; return false;
}
if (info->match & XT_OWNER_GID) if (info->match & XT_OWNER_GID) {
if ((filp->f_cred->fsgid >= info->gid_min && kgid_t gid_min = make_kgid(&init_user_ns, info->gid_min);
filp->f_cred->fsgid <= info->gid_max) ^ kgid_t gid_max = make_kgid(&init_user_ns, info->gid_max);
if ((gid_gte(filp->f_cred->fsgid, gid_min) &&
gid_lte(filp->f_cred->fsgid, gid_max)) ^
!(info->invert & XT_OWNER_GID)) !(info->invert & XT_OWNER_GID))
return false; return false;
}
return true; return true;
} }
@ -56,6 +73,7 @@ static struct xt_match owner_mt_reg __read_mostly = {
.name = "owner", .name = "owner",
.revision = 1, .revision = 1,
.family = NFPROTO_UNSPEC, .family = NFPROTO_UNSPEC,
.checkentry = owner_check,
.match = owner_mt, .match = owner_mt,
.matchsize = sizeof(struct xt_owner_match_info), .matchsize = sizeof(struct xt_owner_match_info),
.hooks = (1 << NF_INET_LOCAL_OUT) | .hooks = (1 << NF_INET_LOCAL_OUT) |