Commit 855e4316 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'batadv-net-pullrequest-20251024' of https://git.open-mesh.org/linux-merge 

Simon Wunderlich says:

====================
Here is a batman-adv bugfix:

 - release references to inactive interfaces, by Sven Eckelmann

* tag 'batadv-net-pullrequest-20251024' of https://git.open-mesh.org/linux-merge:
  batman-adv: Release references to inactive interfaces
====================

Link: https://patch.msgid.link/20251024091150.231141-1-sw@simonwunderlich.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 46a499aa f12b69d8

net/batman-adv/originator.c

+12 −2
Original line number Diff line number Diff line
@@ -763,11 +763,16 @@ int batadv_hardif_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	bat_priv = netdev_priv(mesh_iface);



	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (!primary_if || primary_if->if_status != BATADV_IF_ACTIVE) {

	if (!primary_if) {

		ret = -ENOENT;

		goto out_put_mesh_iface;

	}



	if (primary_if->if_status != BATADV_IF_ACTIVE) {

		ret = -ENOENT;

		goto out_put_primary_if;

	}



	hard_iface = batadv_netlink_get_hardif(bat_priv, cb);

	if (IS_ERR(hard_iface) && PTR_ERR(hard_iface) != -ENONET) {

		ret = PTR_ERR(hard_iface);
@@ -1327,11 +1332,16 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb) 
	bat_priv = netdev_priv(mesh_iface);



	primary_if = batadv_primary_if_get_selected(bat_priv);

	if (!primary_if || primary_if->if_status != BATADV_IF_ACTIVE) {

	if (!primary_if) {

		ret = -ENOENT;

		goto out_put_mesh_iface;

	}



	if (primary_if->if_status != BATADV_IF_ACTIVE) {

		ret = -ENOENT;

		goto out_put_primary_if;

	}



	hard_iface = batadv_netlink_get_hardif(bat_priv, cb);

	if (IS_ERR(hard_iface) && PTR_ERR(hard_iface) != -ENONET) {

		ret = PTR_ERR(hard_iface);