Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb95ec62 authored Apr 17, 2013 by Wei Yongjun Committed by David S. Miller Apr 19, 2013

pkt_sched: fix error return code in fw_change_attrs()



Fix to return -EINVAL when tb[TCA_FW_MASK] is set and head->mask != 0xFFFFFFFF
instead of 0 (ifdef CONFIG_NET_CLS_IND and tb[TCA_FW_INDEV]), as done elsewhere
in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e15465e1

net/sched/cls_fw.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,6 @@ fw_change_attrs(struct net net, struct tcf_proto tp, struct fw_filter *f,
		if (err < 0)
		return err;

		err = -EINVAL;
		if (tb[TCA_FW_CLASSID]) {
		f->res.classid = nla_get_u32(tb[TCA_FW_CLASSID]);
		tcf_bind_filter(tp, &f->res, base);
		@@ -218,6 +217,7 @@ fw_change_attrs(struct net net, struct tcf_proto tp, struct fw_filter *f,
		}
		#endif /* CONFIG_NET_CLS_IND */

		err = -EINVAL;
		if (tb[TCA_FW_MASK]) {
		mask = nla_get_u32(tb[TCA_FW_MASK]);
		if (mask != head->mask)