Skip to content

Commit 07134cf

Browse files
committed
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 <[email protected]>
2 parents 6ee2deb + e2debf0 commit 07134cf

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

net/sched/cls_flower.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,7 @@ static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = {
691691
.len = 128 / BITS_PER_BYTE },
692692
[TCA_FLOWER_KEY_CT_LABELS_MASK] = { .type = NLA_BINARY,
693693
.len = 128 / BITS_PER_BYTE },
694+
[TCA_FLOWER_FLAGS] = { .type = NLA_U32 },
694695
};
695696

696697
static const struct nla_policy

net/sched/cls_matchall.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ static void *mall_get(struct tcf_proto *tp, u32 handle)
157157
static const struct nla_policy mall_policy[TCA_MATCHALL_MAX + 1] = {
158158
[TCA_MATCHALL_UNSPEC] = { .type = NLA_UNSPEC },
159159
[TCA_MATCHALL_CLASSID] = { .type = NLA_U32 },
160+
[TCA_MATCHALL_FLAGS] = { .type = NLA_U32 },
160161
};
161162

162163
static int mall_set_parms(struct net *net, struct tcf_proto *tp,

0 commit comments

Comments
 (0)