Commit 53b2bf3f authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET_SCHED]: Use nla_policy for attribute validation in actions 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6fa8c014

net/sched/act_gact.c

+8 −7
Original line number Diff line number Diff line
@@ -53,6 +53,11 @@ typedef int (*g_rand)(struct tcf_gact *gact); 
static g_rand gact_rand[MAX_RAND]= { NULL, gact_net_rand, gact_determ };

#endif /* CONFIG_GACT_PROB */



static const struct nla_policy gact_policy[TCA_GACT_MAX + 1] = {

	[TCA_GACT_PARMS]	= { .len = sizeof(struct tc_gact) },

	[TCA_GACT_PROB]		= { .len = sizeof(struct tc_gact_p) },

};



static int tcf_gact_init(struct nlattr *nla, struct nlattr *est,

			 struct tc_action *a, int ovr, int bind)

{
@@ -66,20 +71,16 @@ static int tcf_gact_init(struct nlattr *nla, struct nlattr *est, 
	if (nla == NULL)

		return -EINVAL;



	err = nla_parse_nested(tb, TCA_GACT_MAX, nla, NULL);

	err = nla_parse_nested(tb, TCA_GACT_MAX, nla, gact_policy);

	if (err < 0)

		return err;



	if (tb[TCA_GACT_PARMS] == NULL ||

	    nla_len(tb[TCA_GACT_PARMS]) < sizeof(*parm))

	if (tb[TCA_GACT_PARMS] == NULL)

		return -EINVAL;

	parm = nla_data(tb[TCA_GACT_PARMS]);



#ifndef CONFIG_GACT_PROB

	if (tb[TCA_GACT_PROB] != NULL)

#ifdef CONFIG_GACT_PROB

		if (nla_len(tb[TCA_GACT_PROB]) < sizeof(struct tc_gact_p))

			return -EINVAL;

#else

		return -EOPNOTSUPP;

#endif

net/sched/act_ipt.c

+12 −7
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ static int tcf_ipt_release(struct tcf_ipt *ipt, int bind) 
	return ret;

}



static const struct nla_policy ipt_policy[TCA_IPT_MAX + 1] = {

	[TCA_IPT_TABLE]	= { .type = NLA_STRING, .len = IFNAMSIZ },

	[TCA_IPT_HOOK]	= { .type = NLA_U32 },

	[TCA_IPT_INDEX]	= { .type = NLA_U32 },

	[TCA_IPT_TARG]	= { .len = sizeof(struct ipt_entry_target) },

};



static int tcf_ipt_init(struct nlattr *nla, struct nlattr *est,

			struct tc_action *a, int ovr, int bind)

{
@@ -107,22 +114,20 @@ static int tcf_ipt_init(struct nlattr *nla, struct nlattr *est, 
	if (nla == NULL)

		return -EINVAL;



	err = nla_parse_nested(tb, TCA_IPT_MAX, nla, NULL);

	err = nla_parse_nested(tb, TCA_IPT_MAX, nla, ipt_policy);

	if (err < 0)

		return err;



	if (tb[TCA_IPT_HOOK] == NULL ||

	    nla_len(tb[TCA_IPT_HOOK]) < sizeof(u32))

	if (tb[TCA_IPT_HOOK] == NULL)

		return -EINVAL;

	if (tb[TCA_IPT_TARG] == NULL ||

	    nla_len(tb[TCA_IPT_TARG]) < sizeof(*t))

	if (tb[TCA_IPT_TARG] == NULL)

		return -EINVAL;



	td = (struct ipt_entry_target *)nla_data(tb[TCA_IPT_TARG]);

	if (nla_len(tb[TCA_IPT_TARG]) < td->u.target_size)

		return -EINVAL;



	if (tb[TCA_IPT_INDEX] != NULL &&

	    nla_len(tb[TCA_IPT_INDEX]) >= sizeof(u32))

	if (tb[TCA_IPT_INDEX] != NULL)

		index = nla_get_u32(tb[TCA_IPT_INDEX]);



	pc = tcf_hash_check(index, a, bind, &ipt_hash_info);

net/sched/act_mirred.c

+6 −3
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ static inline int tcf_mirred_release(struct tcf_mirred *m, int bind) 
	return 0;

}



static const struct nla_policy mirred_policy[TCA_MIRRED_MAX + 1] = {

	[TCA_MIRRED_PARMS]	= { .len = sizeof(struct tc_mirred) },

};



static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est,

			   struct tc_action *a, int ovr, int bind)

{
@@ -68,12 +72,11 @@ static int tcf_mirred_init(struct nlattr *nla, struct nlattr *est, 
	if (nla == NULL)

		return -EINVAL;



	err = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, NULL);

	err = nla_parse_nested(tb, TCA_MIRRED_MAX, nla, mirred_policy);

	if (err < 0)

		return err;



	if (tb[TCA_MIRRED_PARMS] == NULL ||

	    nla_len(tb[TCA_MIRRED_PARMS]) < sizeof(*parm))

	if (tb[TCA_MIRRED_PARMS] == NULL)

		return -EINVAL;

	parm = nla_data(tb[TCA_MIRRED_PARMS]);

net/sched/act_nat.c

+6 −3
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ static struct tcf_hashinfo nat_hash_info = { 
	.lock	=	&nat_lock,

};



static const struct nla_policy nat_policy[TCA_NAT_MAX + 1] = {

	[TCA_NAT_PARMS]	= { .len = sizeof(struct tc_nat) },

};



static int tcf_nat_init(struct nlattr *nla, struct nlattr *est,

			struct tc_action *a, int ovr, int bind)

{
@@ -52,12 +56,11 @@ static int tcf_nat_init(struct nlattr *nla, struct nlattr *est, 
	if (nla == NULL)

		return -EINVAL;



	err = nla_parse_nested(tb, TCA_NAT_MAX, nla, NULL);

	err = nla_parse_nested(tb, TCA_NAT_MAX, nla, nat_policy);

	if (err < 0)

		return err;



	if (tb[TCA_NAT_PARMS] == NULL ||

	    nla_len(tb[TCA_NAT_PARMS]) < sizeof(*parm))

	if (tb[TCA_NAT_PARMS] == NULL)

		return -EINVAL;

	parm = nla_data(tb[TCA_NAT_PARMS]);

net/sched/act_pedit.c

+6 −3
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ static struct tcf_hashinfo pedit_hash_info = { 
	.lock	=	&pedit_lock,

};



static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = {

	[TCA_PEDIT_PARMS]	= { .len = sizeof(struct tcf_pedit) },

};



static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est,

			  struct tc_action *a, int ovr, int bind)

{
@@ -47,12 +51,11 @@ static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est, 
	if (nla == NULL)

		return -EINVAL;



	err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, NULL);

	err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, pedit_policy);

	if (err < 0)

		return err;



	if (tb[TCA_PEDIT_PARMS] == NULL ||

	    nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm))

	if (tb[TCA_PEDIT_PARMS] == NULL)

		return -EINVAL;

	parm = nla_data(tb[TCA_PEDIT_PARMS]);

	ksize = parm->nkeys * sizeof(struct tc_pedit_key);