Commit d3bcf062 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Zicheng Qu
Browse files

batman-adv: Drop initialization of flexible ethtool_link_ksettings 

mainline inclusion
from mainline-v6.1-rc1
commit 813e62a6
category: other
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBPLJA
CVE: CVE-2025-21823

Reference: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=813e62a6fe7539fdf0d8e018d4f157b57bdaeedd



--------------------------------

The commit 94dfc73e ("treewide: uapi: Replace zero-length arrays with
flexible-array members") changed various structures from using 0-length
arrays to flexible arrays

  net/batman-adv/bat_v_elp.c: note: in included file:
  ./include/linux/ethtool.h:148:38: warning: nested flexible array
  net/batman-adv/bat_v_elp.c:128:9: warning: using sizeof on a flexible structure

In theory, this could be worked around by using {} as initializer for the
variable on the stack. But this variable doesn't has to be initialized at
all by the caller of __ethtool_get_link_ksettings - everything will be
initialized by the callee when no error occurs.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarZicheng Qu <quzicheng@huawei.com>
parent e4a096d1

net/batman-adv/bat_v_elp.c

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) 
	/* if not a wifi interface, check if this device provides data via

	 * ethtool (e.g. an Ethernet adapter)

	 */

	memset(&link_settings, 0, sizeof(link_settings));

	rtnl_lock();

	ret = __ethtool_get_link_ksettings(hard_iface->net_dev, &link_settings);

	rtnl_unlock();