Commit 07134cf6 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 6ee2deb6 e2debf08

net/sched/cls_flower.c

+1 −0
Original line number Diff line number Diff line
@@ -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

net/sched/cls_matchall.c

+1 −0
Original line number Diff line number Diff line
@@ -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,