]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ethtool: fix missing closing paren in rings_reply_size()
authorTao Cui <cuitao@kylinos.cn>
Fri, 8 May 2026 12:54:12 +0000 (20:54 +0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 12 May 2026 01:42:25 +0000 (18:42 -0700)
sizeof(u32) on the _RINGS_CQE_SIZE line is missing its closing
parenthesis, causing nla_total_size() to absorb the subsequent
_TX_PUSH and _RX_PUSH entries.

The resulting size estimate happens to be numerically identical
due to NLA alignment, so not treating this as a real fix.
But the nesting is wrong and misleading.

Signed-off-by: Tao Cui <cuitao@kylinos.cn>
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: Breno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20260508125412.189804-1-cuitao@kylinos.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ethtool/rings.c

index 0fd5dcc3729f8f3d61ccedce39a53ded68bb8e35..9054c89c5d7bb26551890528968e4149be058815 100644 (file)
@@ -63,9 +63,9 @@ static int rings_reply_size(const struct ethnl_req_info *req_base,
               nla_total_size(sizeof(u32)) +    /* _RINGS_TX */
               nla_total_size(sizeof(u32)) +    /* _RINGS_RX_BUF_LEN */
               nla_total_size(sizeof(u8))  +    /* _RINGS_TCP_DATA_SPLIT */
-              nla_total_size(sizeof(u32)  +    /* _RINGS_CQE_SIZE */
+              nla_total_size(sizeof(u32)) +    /* _RINGS_CQE_SIZE */
               nla_total_size(sizeof(u8))  +    /* _RINGS_TX_PUSH */
-              nla_total_size(sizeof(u8))) +    /* _RINGS_RX_PUSH */
+              nla_total_size(sizeof(u8))  +    /* _RINGS_RX_PUSH */
               nla_total_size(sizeof(u32)) +    /* _RINGS_TX_PUSH_BUF_LEN */
               nla_total_size(sizeof(u32)) +    /* _RINGS_TX_PUSH_BUF_LEN_MAX */
               nla_total_size(sizeof(u32)) +    /* _RINGS_HDS_THRESH */