[PATCH] net: sched: report if filter is too large to dump

[PATCH] net: sched: report if filter is too large to dump

[Roman Kapl]

So far, if the filter was too large to fit in the allocated skb, the
kernel did not return any error and stopped dumping. Modify the dumper
so that it returns -ENOMSG when a filter fails to dump and it is the
first filter in the skb. If we are not first, we will get a next chance
with more room.

I understand this is pretty near to being an API change, but the
original design (silent truncation) can be considered a bug.

Note: The error case can happen pretty easily if you create a filter
with 32 actions and have 4kb pages. Also recent versions of iproute try
to be clever with their buffer allocation size, which in turn leads to
smaller SKBs in kernel.

Signed-off-by: Roman Kapl <code@rkapl.cz>
---
 net/sched/cls_api.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index f21610c5da1a..b5771a586c2d 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1399,13 +1399,17 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
 		    nla_get_u32(tca[TCA_CHAIN]) != chain->index)
 			continue;
 		if (!tcf_chain_dump(chain, q, parent, skb, cb,
-				    index_start, &index))
+				    index_start, &index)) {
+			err = -EMSGSIZE;
 			break;
+		}
 	}
 
 	cb->args[0] = index;
 
 out:
+	if (skb->len == 0 && err)
+		return err;
 	return skb->len;
 }
 
-- 
2.16.1

Re: [PATCH] net: sched: report if filter is too large to dump

[David Miller]

From: Roman Kapl <code@rkapl.cz>
Date: Sun, 18 Feb 2018 23:10:47 +0100

> So far, if the filter was too large to fit in the allocated skb, the
> kernel did not return any error and stopped dumping. Modify the dumper
> so that it returns -ENOMSG when a filter fails to dump and it is the
> first filter in the skb. If we are not first, we will get a next chance
> with more room.

I don't see -ENOMSG used in your code, maybe you meant -EMSGSIZE.

> I understand this is pretty near to being an API change, but the
> original design (silent truncation) can be considered a bug.
> 
> Note: The error case can happen pretty easily if you create a filter
> with 32 actions and have 4kb pages. Also recent versions of iproute try
> to be clever with their buffer allocation size, which in turn leads to
> smaller SKBs in kernel.
> 
> Signed-off-by: Roman Kapl <code@rkapl.cz>

Please do a little bit of research to seeh ow other subsystems
handle this situation, we should match whatever they do to be
consistent system wide with netlink.

You have to respin this patch to fix up the commit message anyways :-)

Thanks.