netfilter: xt_owner: bail out with EINVAL in case of unsupported flags 56/212956/1
authorRahul Dadhich <r.dadhich@samsung.com>
Wed, 28 Aug 2019 13:08:56 +0000 (18:38 +0530)
committerRahul Dadhich <r.dadhich@samsung.com>
Wed, 28 Aug 2019 13:09:45 +0000 (18:39 +0530)
Change-Id: Ic83f49e526d564977622f69ff907fb6d928dc161
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>
include/uapi/linux/netfilter/xt_owner.h
net/netfilter/xt_owner.c

index e7731dc..e5c670d 100644 (file)
@@ -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;
index cbe64cf..88aa4bf 100644 (file)
@@ -22,6 +22,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))