diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-13 14:16:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-13 14:16:35 -0800 |
| commit | 07134cf6962377875288b06232d0c41c69d31752 (patch) | |
| tree | bd9fe0777578ed1c47e9aeed99c8adc73525f36c | |
| parent | 6ee2deb6fbed6ed343040215d10f3c73d00304df (diff) | |
| parent | e2debf0852c4d66ba1a8bde12869b196094c70a7 (diff) | |
| download | lwn-07134cf6962377875288b06232d0c41c69d31752.tar.gz lwn-07134cf6962377875288b06232d0c41c69d31752.zip | |
Merge branch 'skip_sw-skip_hw-validation'
Davide Caratti says:
====================
add missing validation of 'skip_hw/skip_sw'
ensure that all classifiers currently supporting HW offload
validate the 'flags' parameter provided by user:
- patch 1/2 fixes cls_matchall
- patch 2/2 fixes cls_flower
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/cls_flower.c | 1 | ||||
| -rw-r--r-- | net/sched/cls_matchall.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index f9c0d1e8d380..7e54d2ab5254 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -691,6 +691,7 @@ static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = { .len = 128 / BITS_PER_BYTE }, [TCA_FLOWER_KEY_CT_LABELS_MASK] = { .type = NLA_BINARY, .len = 128 / BITS_PER_BYTE }, + [TCA_FLOWER_FLAGS] = { .type = NLA_U32 }, }; static const struct nla_policy diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c index 039cc86974f4..610a0b728161 100644 --- a/net/sched/cls_matchall.c +++ b/net/sched/cls_matchall.c @@ -157,6 +157,7 @@ static void *mall_get(struct tcf_proto *tp, u32 handle) static const struct nla_policy mall_policy[TCA_MATCHALL_MAX + 1] = { [TCA_MATCHALL_UNSPEC] = { .type = NLA_UNSPEC }, [TCA_MATCHALL_CLASSID] = { .type = NLA_U32 }, + [TCA_MATCHALL_FLAGS] = { .type = NLA_U32 }, }; static int mall_set_parms(struct net *net, struct tcf_proto *tp, |