summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorOr Gerlitz <ogerlitz@mellanox.com>2017-02-16 09:31:10 +0100
committerDavid S. Miller <davem@davemloft.net>2017-02-17 18:08:04 +0100
commit749e6720d2ee10d5221d5d7b8cee8ac5d1cd690e (patch)
tree314c0c784493090ebf512710f086433d9fd36e2b /net
parentnet: oki-semi: pch_gbe: use new api ethtool_{get|set}_link_ksettings (diff)
downloadlinux-749e6720d2ee10d5221d5d7b8cee8ac5d1cd690e.tar.xz
linux-749e6720d2ee10d5221d5d7b8cee8ac5d1cd690e.zip
net/sched: cls_flower: Properly handle classifier flags dumping
Dump the classifier flags only if non zero and make sure to check the return status of the handler that puts them into the netlink msg. Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/cls_flower.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 0826c8ec3a76..850d98294bf6 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -1229,7 +1229,8 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, unsigned long fh,
if (fl_dump_key_flags(skb, key->control.flags, mask->control.flags))
goto nla_put_failure;
- nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags);
+ if (f->flags && nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags))
+ goto nla_put_failure;
if (tcf_exts_dump(skb, &f->exts))
goto nla_put_failure;