diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-02-05 16:19:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-05 16:19:59 -0800 |
| commit | 4f25049106e0507ff21a9e1fc0645d849e19faf0 (patch) | |
| tree | 0bb28370f4ef81d89030e56df0cf192b778e67dd /net/sched/cls_flow.c | |
| parent | 0ea9d70df8f8be741ee0525490370de06163d2de (diff) | |
| download | kernel_samsung_tuna-4f25049106e0507ff21a9e1fc0645d849e19faf0.zip kernel_samsung_tuna-4f25049106e0507ff21a9e1fc0645d849e19faf0.tar.gz kernel_samsung_tuna-4f25049106e0507ff21a9e1fc0645d849e19faf0.tar.bz2 | |
[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: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_flow.c')
| -rw-r--r-- | net/sched/cls_flow.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c index 8d76986..eeb223c 100644 --- a/net/sched/cls_flow.c +++ b/net/sched/cls_flow.c @@ -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); |