OSDN Git Service

net/sched: cls_flower: validate ct_state for invalid and reply flags
authorwenxu <wenxu@ucloud.cn>
Tue, 23 Feb 2021 07:11:55 +0000 (15:11 +0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 23 Feb 2021 20:23:44 +0000 (12:23 -0800)
Add invalid and reply flags validate in the fl_validate_ct_state.
This makes the checking complete if compared to ovs'
validate_ct_state().

Signed-off-by: wenxu <wenxu@ucloud.cn>
Reviewed-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Link: https://lore.kernel.org/r/1614064315-364-1-git-send-email-wenxu@ucloud.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/sched/cls_flower.c

index 2409e52..d097b5c 100644 (file)
@@ -1417,6 +1417,21 @@ static int fl_validate_ct_state(u16 state, struct nlattr *tb,
                return -EINVAL;
        }
 
+       if (state & TCA_FLOWER_KEY_CT_FLAGS_INVALID &&
+           state & ~(TCA_FLOWER_KEY_CT_FLAGS_TRACKED |
+                     TCA_FLOWER_KEY_CT_FLAGS_INVALID)) {
+               NL_SET_ERR_MSG_ATTR(extack, tb,
+                                   "when inv is set, only trk may be set");
+               return -EINVAL;
+       }
+
+       if (state & TCA_FLOWER_KEY_CT_FLAGS_NEW &&
+           state & TCA_FLOWER_KEY_CT_FLAGS_REPLY) {
+               NL_SET_ERR_MSG_ATTR(extack, tb,
+                                   "new and rpl are mutually exclusive");
+               return -EINVAL;
+       }
+
        return 0;
 }