diff options
| author | Lukasz Pawelczyk <l.pawelczyk@samsung.com> | 2019-05-10 13:46:22 +0200 |
|---|---|---|
| committer | Manish Rathod <manish.r@samsung.com> | 2019-09-10 12:06:57 +0000 |
| commit | 0d84ea3570c90a7cbf57e6922b7ae021b040923b (patch) | |
| tree | d726977666fad397f538b8cbbfdfd80161f1cf01 | |
| parent | 9110996f48dacff93d18a45c5ce76a89f44f98b1 (diff) | |
| download | emulator-kernel-0d84ea3570c90a7cbf57e6922b7ae021b040923b.tar.gz emulator-kernel-0d84ea3570c90a7cbf57e6922b7ae021b040923b.tar.bz2 emulator-kernel-0d84ea3570c90a7cbf57e6922b7ae021b040923b.zip | |
netfilter: xt_owner: Add supplementary groups option
The XT_OWNER_SUPPL_GROUPS flag causes GIDs specified with XT_OWNER_GID
to be also checked in the supplementary groups of a process.
f_cred->group_info cannot be modified during its lifetime and f_cred
holds a reference to it so it's safe to use.
Signed-off-by: Lukasz Pawelczyk <l.pawelczyk@samsung.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
backport from mainline to apply supplementary groups on netfilter
Change-Id: I900d03042c82b4d5f13dec7695e4b1eba7f2aa74
(cherry picked from commit e7a26f2b0e8021c9415f0b92caf9538974720855)
| -rw-r--r-- | include/uapi/linux/netfilter/xt_owner.h | 7 | ||||
| -rw-r--r-- | net/netfilter/xt_owner.c | 23 |
2 files changed, 24 insertions, 6 deletions
diff --git a/include/uapi/linux/netfilter/xt_owner.h b/include/uapi/linux/netfilter/xt_owner.h index 7fcac2e5b33e..e5c670da2464 100644 --- a/include/uapi/linux/netfilter/xt_owner.h +++ b/include/uapi/linux/netfilter/xt_owner.h @@ -4,9 +4,10 @@ #include <linux/types.h> enum { - XT_OWNER_UID = 1 << 0, - XT_OWNER_GID = 1 << 1, - XT_OWNER_SOCKET = 1 << 2, + XT_OWNER_UID = 1 << 0, + XT_OWNER_GID = 1 << 1, + XT_OWNER_SOCKET = 1 << 2, + XT_OWNER_SUPPL_GROUPS = 1 << 3, }; #define XT_OWNER_MASK (XT_OWNER_UID | \ diff --git a/net/netfilter/xt_owner.c b/net/netfilter/xt_owner.c index 127823fa8bae..88aa4bf86ac1 100644 --- a/net/netfilter/xt_owner.c +++ b/net/netfilter/xt_owner.c @@ -63,11 +63,28 @@ owner_mt(const struct sk_buff *skb, struct xt_action_param *par) } if (info->match & XT_OWNER_GID) { + unsigned int i, match = false; kgid_t gid_min = make_kgid(&init_user_ns, info->gid_min); 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)) + struct group_info *gi = filp->f_cred->group_info; + + if (gid_gte(filp->f_cred->fsgid, gid_min) && + gid_lte(filp->f_cred->fsgid, gid_max)) + match = true; + + if (!match && (info->match & XT_OWNER_SUPPL_GROUPS) && gi) { + for (i = 0; i < gi->ngroups; ++i) { + kgid_t group = GROUP_AT(gi, i); + + if (gid_gte(group, gid_min) && + gid_lte(group, gid_max)) { + match = true; + break; + } + } + } + + if (match ^ !(info->invert & XT_OWNER_GID)) return false; } |