Commit ac177a33 authored by Victor Nogueira's avatar Victor Nogueira Committed by David S. Miller
Browse files

net: sched: cls_flower: Undo tcf_bind_filter in case of an error 



If TCA_FLOWER_CLASSID is specified in the netlink message, the code will
call tcf_bind_filter. However, if any error occurs after that, the code
should undo this by calling tcf_unbind_filter.

Fixes: 77b9900e ("tc: introduce Flower classifier")
Signed-off-by: default avatarVictor Nogueira <victor@mojatatu.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26a22194

net/sched/cls_flower.c

+47 −52
Original line number Diff line number Diff line
@@ -2173,53 +2173,6 @@ static bool fl_needs_tc_skb_ext(const struct fl_flow_key *mask) 
	return mask->meta.l2_miss;

}



static int fl_set_parms(struct net *net, struct tcf_proto *tp,

			struct cls_fl_filter *f, struct fl_flow_mask *mask,

			unsigned long base, struct nlattr **tb,

			struct nlattr *est,

			struct fl_flow_tmplt *tmplt,

			u32 flags, u32 fl_flags,

			struct netlink_ext_ack *extack)

{

	int err;



	err = tcf_exts_validate_ex(net, tp, tb, est, &f->exts, flags,

				   fl_flags, extack);

	if (err < 0)

		return err;



	if (tb[TCA_FLOWER_CLASSID]) {

		f->res.classid = nla_get_u32(tb[TCA_FLOWER_CLASSID]);

		if (flags & TCA_ACT_FLAGS_NO_RTNL)

			rtnl_lock();

		tcf_bind_filter(tp, &f->res, base);

		if (flags & TCA_ACT_FLAGS_NO_RTNL)

			rtnl_unlock();

	}



	err = fl_set_key(net, tb, &f->key, &mask->key, extack);

	if (err)

		return err;



	fl_mask_update_range(mask);

	fl_set_masked_key(&f->mkey, &f->key, mask);



	if (!fl_mask_fits_tmplt(tmplt, mask)) {

		NL_SET_ERR_MSG_MOD(extack, "Mask does not fit the template");

		return -EINVAL;

	}



	/* Enable tc skb extension if filter matches on data extracted from

	 * this extension.

	 */

	if (fl_needs_tc_skb_ext(&mask->key)) {

		f->needs_tc_skb_ext = 1;

		tc_skb_ext_tc_enable();

	}



	return 0;

}



static int fl_ht_insert_unique(struct cls_fl_filter *fnew,

			       struct cls_fl_filter *fold,

			       bool *in_ht)
@@ -2251,6 +2204,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, 
	struct cls_fl_head *head = fl_head_dereference(tp);

	bool rtnl_held = !(flags & TCA_ACT_FLAGS_NO_RTNL);

	struct cls_fl_filter *fold = *arg;

	bool bound_to_filter = false;

	struct cls_fl_filter *fnew;

	struct fl_flow_mask *mask;

	struct nlattr **tb;
@@ -2335,15 +2289,46 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, 
	if (err < 0)

		goto errout_idr;



	err = fl_set_parms(net, tp, fnew, mask, base, tb, tca[TCA_RATE],

			   tp->chain->tmplt_priv, flags, fnew->flags,

	err = tcf_exts_validate_ex(net, tp, tb, tca[TCA_RATE],

				   &fnew->exts, flags, fnew->flags,

				   extack);

	if (err)

	if (err < 0)

		goto errout_idr;



	if (tb[TCA_FLOWER_CLASSID]) {

		fnew->res.classid = nla_get_u32(tb[TCA_FLOWER_CLASSID]);

		if (flags & TCA_ACT_FLAGS_NO_RTNL)

			rtnl_lock();

		tcf_bind_filter(tp, &fnew->res, base);

		if (flags & TCA_ACT_FLAGS_NO_RTNL)

			rtnl_unlock();

		bound_to_filter = true;

	}



	err = fl_set_key(net, tb, &fnew->key, &mask->key, extack);

	if (err)

		goto unbind_filter;



	fl_mask_update_range(mask);

	fl_set_masked_key(&fnew->mkey, &fnew->key, mask);



	if (!fl_mask_fits_tmplt(tp->chain->tmplt_priv, mask)) {

		NL_SET_ERR_MSG_MOD(extack, "Mask does not fit the template");

		err = -EINVAL;

		goto unbind_filter;

	}



	/* Enable tc skb extension if filter matches on data extracted from

	 * this extension.

	 */

	if (fl_needs_tc_skb_ext(&mask->key)) {

		fnew->needs_tc_skb_ext = 1;

		tc_skb_ext_tc_enable();

	}



	err = fl_check_assign_mask(head, fnew, fold, mask);

	if (err)

		goto errout_idr;

		goto unbind_filter;



	err = fl_ht_insert_unique(fnew, fold, &in_ht);

	if (err)
@@ -2434,6 +2419,16 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, 
				       fnew->mask->filter_ht_params);

errout_mask:

	fl_mask_put(head, fnew->mask);



unbind_filter:

	if (bound_to_filter) {

		if (flags & TCA_ACT_FLAGS_NO_RTNL)

			rtnl_lock();

		tcf_unbind_filter(tp, &fnew->res);

		if (flags & TCA_ACT_FLAGS_NO_RTNL)

			rtnl_unlock();

	}



errout_idr:

	if (!fold)

		idr_remove(&head->handle_idr, fnew->handle);