Commit 4f250491 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET_SCHED]: cls_flow: fix key mask validity check 



Since we're using fls(), we need to check whether the value is
non-zero first.

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

net/sched/cls_flow.c

+3 −2
Original line number Diff line number Diff line
@@ -402,12 +402,13 @@ static int flow_change(struct tcf_proto *tp, unsigned long base, 


	if (tb[TCA_FLOW_KEYS]) {

		keymask = nla_get_u32(tb[TCA_FLOW_KEYS]);

		if (fls(keymask) - 1 > FLOW_KEY_MAX)

			return -EOPNOTSUPP;



		nkeys = hweight32(keymask);

		if (nkeys == 0)

			return -EINVAL;



		if (fls(keymask) - 1 > FLOW_KEY_MAX)

			return -EOPNOTSUPP;

	}



	err = tcf_exts_validate(tp, tb, tca[TCA_RATE], &e, &flow_ext_map);