Skip to content

Commit 23cfe94

Browse files
pmachataPaolo Abeni
authored andcommitted
rtnetlink: Fix handling of disabled L3 stats in RTM_GETSTATS replies
When L3 stats are disabled, rtnl_offload_xstats_get_size_stats() returns size of 0, which is supposed to be an indication that the corresponding attribute should not be emitted. However, instead, the current code reserves a 0-byte attribute. The reason this does not show up as a citation on a kasan kernel is that netdev_offload_xstats_get(), which is supposed to fill in the data, never ends up getting called, because rtnl_offload_xstats_get_stats() notices that the stats are not actually used and skips the call. Thus a zero-length IFLA_OFFLOAD_XSTATS_L3_STATS attribute ends up in a response, confusing the userspace. Fix by skipping the L3-stats related block in rtnl_offload_xstats_fill(). Fixes: 0e7788f ("net: rtnetlink: Add UAPI for obtaining L3 offload xstats") Signed-off-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Ido Schimmel <idosch@nvidia.com> Link: https://lore.kernel.org/r/591b58e7623edc3eb66dd1fcfa8c8f133d090974.1649794741.git.petrm@nvidia.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
1 parent 00fa91b commit 23cfe94

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

net/core/rtnetlink.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5242,6 +5242,8 @@ static int rtnl_offload_xstats_fill(struct sk_buff *skb, struct net_device *dev,
52425242
*prividx = attr_id_l3_stats;
52435243

52445244
size_l3 = rtnl_offload_xstats_get_size_stats(dev, t_l3);
5245+
if (!size_l3)
5246+
goto skip_l3_stats;
52455247
attr = nla_reserve_64bit(skb, attr_id_l3_stats, size_l3,
52465248
IFLA_OFFLOAD_XSTATS_UNSPEC);
52475249
if (!attr)
@@ -5253,6 +5255,7 @@ static int rtnl_offload_xstats_fill(struct sk_buff *skb, struct net_device *dev,
52535255
return err;
52545256

52555257
have_data = true;
5258+
skip_l3_stats:
52565259
*prividx = 0;
52575260
}
52585261

0 commit comments

Comments
 (0)