netfilter: xt_owner: bail out with EINVAL in case of unsupported flags

Reject flags that are not supported with EINVAL.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
[sw0312.kim: backport from mainline to apply supplementary groups on netfilter]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I2ab809e6b7e3823e3fd3af053348dac9af009cca

diff --git a/include/uapi/linux/netfilter/xt_owner.h b/include/uapi/linux/netfilter/xt_owner.h
index e7731dcc51f46f49f427ee4539b6c2259c915a4e..e5c670da24649d294ff45abb328baeede7d5a6b8 100644 (file)
--- a/include/uapi/linux/netfilter/xt_owner.h
+++ b/include/uapi/linux/netfilter/xt_owner.h
@@ -10,6 +10,11 @@ enum {
        XT_OWNER_SUPPL_GROUPS = 1 << 3,
 };
 
+#define XT_OWNER_MASK  (XT_OWNER_UID |         \
+                        XT_OWNER_GID |         \
+                        XT_OWNER_SOCKET |      \
+                        XT_OWNER_SUPPL_GROUPS)
+
 struct xt_owner_match_info {
        __u32 uid_min, uid_max;
        __u32 gid_min, gid_max;

diff --git a/net/netfilter/xt_owner.c b/net/netfilter/xt_owner.c
index 5b21999a5b53de86bfa9007ea47af86fb01b0862..2289544b160fcfca8506582d1cb2e2b860a2851f 100644 (file)
--- a/net/netfilter/xt_owner.c
+++ b/net/netfilter/xt_owner.c
@@ -21,6 +21,9 @@ static int owner_check(const struct xt_mtchk_param *par)
 {
        struct xt_owner_match_info *info = par->matchinfo;
 
+       if (info->match & ~XT_OWNER_MASK)
+               return -EINVAL;
+
        /* 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))