netdev-genl: fix error codes when outputting XDP features
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 netdev-genl: fix error codes when outputting XDP features
-EINVAL will interrupt the dump. The correct error to return if we have more data to dump is -EMSGSIZE.
Discovered by doing:
for i in seq 80; do ip link add type veth; done
./cli.py --dbg-small-recv 5300 --spec netdev.yaml --dump dev-get >> /dev/null [...]
nl_len = 64 (48) nl_flags = 0x0 nl_type = 19
nl_len = 20 (4) nl_flags = 0x2 nl_type = 3error: -22
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- net/core/netdev-genl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
net/core/netdev-genl.c +8 -8
@@ -59,22 +59,22 @@ XDP_METADATA_KFUNC_xxxnla_put_u64_64bit (rsp,NETDEV_A_DEV_XDP_RX_METADATA_FEATURES , xdp_rx_meta,NETDEV_A_DEV_PAD ) ||nla_put_u64_64bit (rsp,NETDEV_A_DEV_XSK_FEATURES , - xsk_features, NETDEV_A_DEV_PAD)) { -genlmsg_cancel (rsp, hdr); -return -EINVAL ; - } + xsk_features, NETDEV_A_DEV_PAD)) + goto err_cancel_msg;if (netdev->xdp_features &NETDEV_XDP_ACT_XSK_ZEROCOPY ) {if (nla_put_u32 (rsp,NETDEV_A_DEV_XDP_ZC_MAX_SEGS , - netdev->xdp_zc_max_segs)) { -genlmsg_cancel (rsp, hdr); -return -EINVAL ; - } + netdev->xdp_zc_max_segs)) + goto err_cancel_msg; }genlmsg_end (rsp, hdr);return 0 ; + +err_cancel_msg: +genlmsg_cancel (rsp, hdr); +return -EMSGSIZE ; } static void
Signature · 1 line
2.45.2
Quoted 12 lines · Jakub Kicinski
-EINVALwill interrupt the dump. The correct error to return if we have more data to dump is-EMSGSIZE.Discovered by doing:
for i in `seq 80`; do ip link add type veth; done ./cli.py --dbg-small-recv 5300 --spec netdev.yaml --dump dev-get >> /dev/null [...] nl_len = 64 (48) nl_flags = 0x0 nl_type = 19 nl_len = 20 (4) nl_flags = 0x2 nl_type = 3 error: -22
Quoted 2 lines
Fixes d3d854fd6a1d ("netdev-genl: create a simple family for netdev stuff")Signed-off-by Jakub Kicinski <[email protected]>
LGTM.
Quoted 46 lines
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]--- net/core/netdev-genl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)net/core/netdev-genl.c +8
-8@@ -59,22 +59,22 @@ XDP_METADATA_KFUNC_xxxnla_put_u64_64bit (rsp,NETDEV_A_DEV_XDP_RX_METADATA_FEATURES , xdp_rx_meta,NETDEV_A_DEV_PAD ) ||nla_put_u64_64bit (rsp,NETDEV_A_DEV_XSK_FEATURES , - xsk_features, NETDEV_A_DEV_PAD)) { -genlmsg_cancel (rsp, hdr); -return -EINVAL ; - } + xsk_features, NETDEV_A_DEV_PAD)) + goto err_cancel_msg;if (netdev->xdp_features &NETDEV_XDP_ACT_XSK_ZEROCOPY ) {if (nla_put_u32 (rsp,NETDEV_A_DEV_XDP_ZC_MAX_SEGS , - netdev->xdp_zc_max_segs)) { -genlmsg_cancel (rsp, hdr); -return -EINVAL ; - } + netdev->xdp_zc_max_segs)) + goto err_cancel_msg; }genlmsg_end (rsp, hdr);return 0 ; + +err_cancel_msg: +genlmsg_cancel (rsp, hdr); +return -EMSGSIZE ; } static void
Eric Dumazet
Reviewed-byQuoted 14 lines · Amritha
Quoted 12 lines · Jakub Kicinski
-EINVALwill interrupt the dump. The correct error to return if we have more data to dump is-EMSGSIZE.Discovered by doing:
for i in `seq 80`; do ip link add type veth; done ./cli.py --dbg-small-recv 5300 --spec netdev.yaml --dump dev-get >> /dev/null [...] nl_len = 64 (48) nl_flags = 0x0 nl_type = 19 nl_len = 20 (4) nl_flags = 0x2 nl_type = 3 error: -22
Quoted 5 lines
Quoted 2 lines
Fixes d3d854fd6a1d ("netdev-genl: create a simple family for netdev stuff")Signed-off-by Jakub Kicinski <[email protected]>LGTM.
Reviewed-by Amritha Nambiar <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 5 lines · On Thu, 13 Jun 2024 14:30:44 -0700 you wrote:
-EINVALwill interrupt the dump. The correct error to return if we have more data to dump is-EMSGSIZE.Discovered by doing:
Quoted 8 lines
for i in
seq 80; do ip link add type veth; done
./cli.py --dbg-small-recv 5300 --specnetdev.yaml--dump dev-get >>/dev/null[...]nl_len = 64 (48) nl_flags = 0x0 nl_type = 19 nl_len = 20 (4) nl_flags = 0x2 nl_type = 3error: -22
[...]
Here is the summary with links:
- [net] netdev-genl: fix error codes when outputting XDP features
https://git.kernel.org/netdev/net/c/7ed352d34f1a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html