linux-merge February 2024

linux-merge@lists.open-mesh.org

3 participants
18 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20240205
by batman＠open-mesh.org 05 Feb '24

05 Feb '24

The following commit has been merged in the master branch: commit 5593e9abf1cf2bf096366d8c7fd933bc69d561ce Author: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue Jan 2 07:52:21 2024 +0100 batman-adv: Improve exception handling in batadv_throw_uevent() The kfree() function was called in up to three cases by the batadv_throw_uevent() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. * Thus adjust jump targets. * Reorder kfree() calls at the end. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 5fc754b0b3f7..75119f1ffccc 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -691,29 +691,31 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, "%s%s", BATADV_UEV_TYPE_VAR, batadv_uev_type_str[type]); if (!uevent_env[0]) - goto out; + goto report_error; uevent_env[1] = kasprintf(GFP_ATOMIC, "%s%s", BATADV_UEV_ACTION_VAR, batadv_uev_action_str[action]); if (!uevent_env[1]) - goto out; + goto free_first_env; /* If the event is DEL, ignore the data field */ if (action != BATADV_UEV_DEL) { uevent_env[2] = kasprintf(GFP_ATOMIC, "%s%s", BATADV_UEV_DATA_VAR, data); if (!uevent_env[2]) - goto out; + goto free_second_env; } ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env); -out: - kfree(uevent_env[0]); - kfree(uevent_env[1]); kfree(uevent_env[2]); +free_second_env: + kfree(uevent_env[1]); +free_first_env: + kfree(uevent_env[0]); if (ret) +report_error: batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Impossible to send uevent for (%s,%s,%s) event (err: %d)\n", batadv_uev_type_str[type], -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20240205
by batman＠open-mesh.org 05 Feb '24

05 Feb '24

The following commit has been merged in the master branch: commit ffc15626c861f811f9778914be004fcf43810a91 Author: Markus Elfring <elfring(a)users.sourceforge.net> Date: Tue Jan 2 07:27:45 2024 +0100 batman-adv: Return directly after a failed batadv_dat_select_candidates() in batadv_dat_forward_data() The kfree() function was called in one case by the batadv_dat_forward_data() function during error handling even if the passed variable contained a null pointer. This issue was detected by using the Coccinelle software. * Thus return directly after a batadv_dat_select_candidates() call failed at the beginning. * Delete the label “out” which became unnecessary with this refactoring. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> Acked-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 28a939d56090..4c7e85534324 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -684,7 +684,7 @@ static bool batadv_dat_forward_data(struct batadv_priv *bat_priv, cand = batadv_dat_select_candidates(bat_priv, ip, vid); if (!cand) - goto out; + return ret; batadv_dbg(BATADV_DBG_DAT, bat_priv, "DHT_SEND for %pI4\n", &ip); @@ -728,7 +728,6 @@ free_orig: batadv_orig_node_put(cand[i].orig_node); } -out: kfree(cand); return ret; } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20240202
by batman＠open-mesh.org 02 Feb '24

02 Feb '24

The following commit has been merged in the master branch: commit 59f7ea703c38abc3f239068d49cc8897740e4c54 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Jan 9 22:58:59 2024 +0100 batman-adv: mcast: fix mcast packet type counter on timeouted nodes When a node which does not have the new batman-adv multicast packet type capability vanishes then the according, global counter erroneously would not be reduced in response on other nodes. Which in turn leads to the mesh never switching back to sending with the new multicast packet type. Fix this by reducing the according counter when such a node times out. Fixes: 90039133221e ("batman-adv: mcast: implement multicast packet generation") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index d982daea8329..b4f8b4af1722 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -2198,6 +2198,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) BATADV_MCAST_WANT_NO_RTR4); batadv_mcast_want_rtr6_update(bat_priv, orig, BATADV_MCAST_WANT_NO_RTR6); + batadv_mcast_have_mc_ptype_update(bat_priv, orig, + BATADV_MCAST_HAVE_MC_PTYPE_CAPA); spin_unlock_bh(&orig->mcast_handler_lock); } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20240202
by batman＠open-mesh.org 02 Feb '24

02 Feb '24

The following commit has been merged in the master branch: commit 0a186b49bba596b81de5a686ce5bfc9cd48ab3ef Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Wed Jan 17 06:22:20 2024 +0100 batman-adv: mcast: fix memory leak on deleting a batman-adv interface The batman-adv multicast tracker TVLV handler is registered for the new batman-adv multicast packet type upon creating a batman-adv interface, but not unregistered again upon the interface's deletion, leading to a memory leak. Fix this memory leak by calling the according TVLV handler unregister routine for the multicast tracker TVLV upon batman-adv interface deletion. Fixes: 07afe1ba288c ("batman-adv: mcast: implement multicast packet reception and forwarding") Reported-and-tested-by: syzbot+ebe64cc5950868e77358(a)syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/000000000000beadc4060f0cbc23@google.com/ Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index b4f8b4af1722..14088c4ff2f6 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -2175,6 +2175,7 @@ void batadv_mcast_free(struct batadv_priv *bat_priv) cancel_delayed_work_sync(&bat_priv->mcast.work); batadv_tvlv_container_unregister(bat_priv, BATADV_TVLV_MCAST, 2); + batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST_TRACKER, 1); batadv_tvlv_handler_unregister(bat_priv, BATADV_TVLV_MCAST, 2); /* safely calling outside of worker, as worker was canceled above */ -- LinuxNextTracking

1 0

Build check errors found: 2024-02-02
by postmaster＠open-mesh.org 02 Feb '24

02 Feb '24

Name of failed tests ==================== main ---- * difference between net-next and batadv main Output of different failed tests ================================ main: difference between net-next and batadv main ------------------------------------------------- netnext/net/batman-adv/distributed-arp-table.c | 3 ++- netnext/net/batman-adv/main.c | 14 ++++++-------- netnext/net/batman-adv/netlink.c | 1 + 3 files changed, 9 insertions(+), 9 deletions(-) Statistics ========== stable ------ Failed tests: 0 Started build tests: 227 Tested Linux versions: 38 Tested configs: 111 main ---- Failed tests: 1 Started build tests: 205 Tested Linux versions: 38 Tested configs: 102

1 0

Coverity Scan: Analysis completed for batctl
by scan-admin＠coverity.com 01 Feb '24

01 Feb '24

Your request for analysis of batctl has been completed successfully. The results are available at https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P… Build ID: 588614 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 01 Feb '24

01 Feb '24

Your request for analysis of alfred has been completed successfully. The results are available at https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P… Build ID: 588612 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

Build check errors found: 2024-02-01
by postmaster＠open-mesh.org 01 Feb '24

01 Feb '24

Name of failed tests ==================== main ---- * difference between net-next and batadv main * headers stable ------ * difference between net and batadv stable Output of different failed tests ================================ stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/Makefile | 1 net/net/batman-adv/bridge_loop_avoidance.c | 2 net/net/batman-adv/fragmentation.c | 8 net/net/batman-adv/gateway_client.c | 2 net/net/batman-adv/main.c | 5 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 129 ++ net/net/batman-adv/multicast.h | 30 net/net/batman-adv/multicast_forw.c | 1178 ++++++++++++++++++++ net/net/batman-adv/netlink.c | 2 net/net/batman-adv/originator.c | 28 net/net/batman-adv/originator.h | 3 net/net/batman-adv/routing.c | 70 + net/net/batman-adv/routing.h | 11 net/net/batman-adv/soft-interface.c | 18 net/net/batman-adv/types.h | 70 + 16 files changed, 1533 insertions(+), 26 deletions(-) main: difference between net-next and batadv main ------------------------------------------------- netnext/net/batman-adv/multicast.c | 3 --- 1 file changed, 3 deletions(-) main: headers ------------- diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c index ae79ab26..fdfdf2cb 100644 --- a/net/batman-adv/netlink.c +++ b/net/batman-adv/netlink.c @@ -15,7 +15,6 @@ #include <linux/cache.h> #include <linux/err.h> #include <linux/errno.h> -#include <linux/export.h> #include <linux/genetlink.h> #include <linux/gfp.h> #include <linux/if_ether.h> Statistics ========== main ---- Failed tests: 2 Started build tests: 200 Tested Linux versions: 38 Tested configs: 105 stable ------ Failed tests: 1 Started build tests: 231 Tested Linux versions: 38 Tested configs: 103

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge February 2024