summaryrefslogtreecommitdiff
path: root/drivers/net/netconsole.c
diff options
context:
space:
mode:
authorBreno Leitao <leitao@debian.org>2025-02-06 03:05:56 -0800
committerDavid S. Miller <davem@davemloft.net>2025-02-10 15:04:18 +0000
commit2bae25b16aea249f0e96757b6cd28b03d2b4397f (patch)
tree0569c962c509ef50a8f21fa1cbc481c7817085f3 /drivers/net/netconsole.c
parent364f67837e86cfd59ef8727dbf6db15594281d4d (diff)
netconsole: Include sysdata in extradata entry count
Modify count_extradata_entries() to include sysdata fields when calculating the total number of extradata entries. This change ensures that the sysdata feature, specifically the CPU number field, is correctly counted against the MAX_EXTRADATA_ITEMS limit. The modification adds a simple check for the CPU_NR flag in the sysdata_fields, incrementing the entry count accordingly. Signed-off-by: Breno Leitao <leitao@debian.org> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netconsole.c')
-rw-r--r--drivers/net/netconsole.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 710330ae8ee4..50739c7dbfb6 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -694,7 +694,15 @@ out_unlock:
*/
static size_t count_extradata_entries(struct netconsole_target *nt)
{
- return list_count_nodes(&nt->userdata_group.cg_children);
+ size_t entries;
+
+ /* Userdata entries */
+ entries = list_count_nodes(&nt->userdata_group.cg_children);
+ /* Plus sysdata entries */
+ if (nt->sysdata_fields & CPU_NR)
+ entries += 1;
+
+ return entries;
}
static ssize_t remote_mac_store(struct config_item *item, const char *buf,