Message ID | 20240303052408.310064-3-kuba@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 0b11b1c5c320555483e8a94c44549db24c289987 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | netlink: handle EMSGSIZE errors in the core | expand |
On Sat, Mar 02, 2024 at 09:24:07PM -0800, Jakub Kicinski wrote: > Previous change added -EMSGSIZE handling to af_netlink, we don't > have to hide these errors any longer. > > Theoretically the error handling changes from: > if (err == -EMSGSIZE) > to > if (err == -EMSGSIZE && skb->len) > > everywhere, but in practice it doesn't matter. > All messages fit into NLMSG_GOODSIZE, so overflow of an empty > skb cannot happen. > > Reviewed-by: Eric Dumazet <edumazet@google.com> > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Ido Schimmel <idosch@nvidia.com>
diff --git a/net/core/netdev-genl.c b/net/core/netdev-genl.c index fd98936da3ae..918b109e0cf4 100644 --- a/net/core/netdev-genl.c +++ b/net/core/netdev-genl.c @@ -152,10 +152,7 @@ int netdev_nl_dev_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb) } rtnl_unlock(); - if (err != -EMSGSIZE) - return err; - - return skb->len; + return err; } static int @@ -287,10 +284,7 @@ int netdev_nl_napi_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb) } rtnl_unlock(); - if (err != -EMSGSIZE) - return err; - - return skb->len; + return err; } static int @@ -463,10 +457,7 @@ int netdev_nl_queue_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb) } rtnl_unlock(); - if (err != -EMSGSIZE) - return err; - - return skb->len; + return err; } static int netdev_genl_netdevice_event(struct notifier_block *nb, diff --git a/net/core/page_pool_user.c b/net/core/page_pool_user.c index 278294aca66a..3a3277ba167b 100644 --- a/net/core/page_pool_user.c +++ b/net/core/page_pool_user.c @@ -103,8 +103,6 @@ netdev_nl_page_pool_get_dump(struct sk_buff *skb, struct netlink_callback *cb, mutex_unlock(&page_pools_lock); rtnl_unlock(); - if (skb->len && err == -EMSGSIZE) - return skb->len; return err; }