commits

commits@lists.open-mesh.org

1 participants
12373 discussions

[linux-merge]linux integration; branch, batadv/net, updated. v6.7-4631-ga67d6793286f
by postmaster＠open-mesh.org 17 Jan '24

17 Jan '24

The following commit has been merged in the batadv/net branch: commit a67d6793286ffab46b72b1afff5fb1f0ca55f2e1 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-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 */ -- linux integration

1 0

[batman-adv] main,main: batman-adv: mcast: fix memory leak on deleting a batman-adv interface (ecdc425a)
by postmaster＠open-mesh.org 17 Jan '24

17 Jan '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit ecdc425a87d40eba44c9c094293d50d3e9a38b45 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: 8ed36122d709 ("batman-adv: mcast: implement multicast packet reception and forwarding") Reported-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> >--------------------------------------------------------------- ecdc425a87d40eba44c9c094293d50d3e9a38b45 net/batman-adv/multicast.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index c8620905..38fab5e4 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -2183,6 +2183,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 */

1 0

[batman-adv] main,main: batman-adv: Drop support for Linux < 4.19 (3a12789c)
by postmaster＠open-mesh.org 12 Jan '24

12 Jan '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 3a12789c116f05560b3e288967d19a585f79a7ce Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jan 10 22:14:37 2024 +0100 batman-adv: Drop support for Linux < 4.19 The Linux Kernel 4.14 reached its end of life [1] after 6 years. Instead it is recommended to use at least kernel 4.19. It is also over 5 years old but still maintained by the stable kernel team. All older kernels (4.14 - v4.18) will be dropped to reduce the support overhead. [1] https://lore.kernel.org/r/2024011046-ecology-tiptoeing-ce50@gregkh/ Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 3a12789c116f05560b3e288967d19a585f79a7ce README.external.rst | 2 +- compat-include/linux/netdevice.h | 8 -------- compat-include/linux/stddef.h | 24 ------------------------ compat-include/net/cfg80211.h | 40 ---------------------------------------- compat-include/net/genetlink.h | 18 ------------------ compat.h | 7 ------- 6 files changed, 1 insertion(+), 98 deletions(-) diff --git a/README.external.rst b/README.external.rst index 3b014af8..4e1de973 100644 --- a/README.external.rst +++ b/README.external.rst @@ -12,7 +12,7 @@ and as an external module. The external module allows to get new features without upgrading to a newer kernel version and to get batman-adv specific bug fixes for kernels that are not supported anymore. It compiles against and should work -with Linux 4.14 - 6.7. Supporting older versions is not +with Linux 4.19 - 6.7. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 3188ad3d..a489ac9b 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -13,14 +13,6 @@ #include <linux/version.h> #include_next <linux/netdevice.h> -#if LINUX_VERSION_IS_LESS(4, 15, 0) - -#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ - netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) - -#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ - - #if LINUX_VERSION_IS_LESS(5, 15, 0) static inline void batadv_dev_put(struct net_device *dev) diff --git a/compat-include/linux/stddef.h b/compat-include/linux/stddef.h deleted file mode 100644 index c4558f81..00000000 --- a/compat-include/linux/stddef.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ - -#include <linux/version.h> -#include_next <linux/stddef.h> - -#if LINUX_VERSION_IS_LESS(4, 16, 0) - -#ifndef sizeof_field -#define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) -#endif - -#endif /* LINUX_VERSION_IS_LESS(4, 16, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ */ diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h deleted file mode 100644 index 4bfcd5a3..00000000 --- a/compat-include/net/cfg80211.h +++ /dev/null @@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) B.A.T.M.A.N. contributors: - * - * Marek Lindner, Simon Wunderlich - * - * This file contains macros for maintaining compatibility with older versions - * of the Linux kernel. - */ - -#ifndef _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ -#define _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ - -#include <linux/version.h> -#include_next <net/cfg80211.h> - - -#if LINUX_VERSION_IS_LESS(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) - -/* cfg80211 fix: https://patchwork.kernel.org/patch/10449857/ */ -static inline int batadv_cfg80211_get_station(struct net_device *dev, - const u8 *mac_addr, - struct station_info *sinfo) -{ - memset(sinfo, 0, sizeof(*sinfo)); - return cfg80211_get_station(dev, mac_addr, sinfo); -} - -#define cfg80211_get_station(dev, mac_addr, sinfo) \ - batadv_cfg80211_get_station(dev, mac_addr, sinfo) - -#endif /* LINUX_VERSION_IS_LESS(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) */ - - -#if LINUX_VERSION_IS_LESS(4, 18, 0) - -#define cfg80211_sinfo_release_content(sinfo) - -#endif /* LINUX_VERSION_IS_LESS(4, 18, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ */ diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 05c57ce0..85376044 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -13,24 +13,6 @@ #include <linux/version.h> #include_next <net/genetlink.h> -#if LINUX_VERSION_IS_LESS(4, 15, 0) - -static inline -void batadv_genl_dump_check_consistent(struct netlink_callback *cb, - void *user_hdr) -{ - struct genl_family genl_family = { - .hdrsize = 0, - }; - - genl_dump_check_consistent(cb, user_hdr, &genl_family); -} - -#define genl_dump_check_consistent batadv_genl_dump_check_consistent - -#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ - - #if LINUX_VERSION_IS_LESS(5, 10, 0) #if LINUX_VERSION_IS_LESS(5, 2, 0) diff --git a/compat.h b/compat.h index 8e19f9bb..638bfc54 100644 --- a/compat.h +++ b/compat.h @@ -16,13 +16,6 @@ #include "compat-autoconf.h" -#if LINUX_VERSION_IS_LESS(4, 15, 0) - -#define batadv_softif_slave_add(__dev, __slave_dev, __extack) \ - batadv_softif_slave_add(__dev, __slave_dev) - -#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ - #endif /* __KERNEL__ */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.7-4632-g530cf24273e9
by postmaster＠open-mesh.org 12 Jan '24

12 Jan '24

The following commit has been merged in the batadv/net-next branch: commit 530cf24273e9a0fa6933c768bea2bc1e755facf4 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], -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.7-4632-g530cf24273e9
by postmaster＠open-mesh.org 12 Jan '24

12 Jan '24

The following commit has been merged in the batadv/net-next branch: commit 88046ca5c759f8b313d44c8fb6e3b428121a01e3 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; } -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net-next, updated. v6.7-4632-g530cf24273e9
by postmaster＠open-mesh.org 12 Jan '24

12 Jan '24

The following commit has been merged in the batadv/net-next branch: commit 122bab5080713ecb05fd684ecc31493047821b2c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Fri Jan 12 17:37:46 2024 +0100 batman-adv: Start new development cycle This version will contain all the (major or even only minor) changes for Linux 6.9. The version number isn't a semantic version number with major and minor information. It is just encoding the year of the expected publishing as Linux -rc1 and the number of published versions this year (starting at 0). Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 870dcd7f1786..8ca854a75a32 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2024.0" +#define BATADV_SOURCE_VERSION "2024.1" #endif /* B.A.T.M.A.N. parameters */ -- linux integration

1 0

[linux-merge]linux integration; branch, batadv/net, updated. v6.7-4630-g35c655c10384
by postmaster＠open-mesh.org 12 Jan '24

12 Jan '24

The following commit has been merged in the batadv/net branch: commit 35c655c10384872fe0ab9a79d4b1439931013ca6 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); } -- linux integration

1 0

[linux-merge]linux integration; branch, base/net-next, updated. v6.7-4629-g3e7aeb78ab01
by postmaster＠open-mesh.org 12 Jan '24

12 Jan '24

The following commit has been merged in the base/net-next branch: commit 39620a35076d6014cbaab0b405824005af40765b Merge: 72a813a4252fe622ebdfd5caa948e91a767959e6 c3ed16a64c0b0a5b116c9753bf48496d49daffb5 Author: David S. Miller <davem(a)davemloft.net> Date: Sat Nov 18 17:40:34 2023 +0000 Merge tag 'batadv-next-pullrequest-20231115' of git://git.open-mesh.org/linux-merge This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Implement new multicast packet type, including its transmission, forwarding and parsing, by Linus Lüssing (3 patches) - Switch to new headers for sprintf and array size, by Sven Eckelmann (2 patches) Signed-off-by: David S. Miller <davem(a)davemloft.net> -- linux integration

1 0

[linux-merge]linux integration; branch, base/net, updated. v6.7-4629-g3e7aeb78ab01
by postmaster＠open-mesh.org 12 Jan '24

12 Jan '24

The following commit has been merged in the base/net branch: commit 39620a35076d6014cbaab0b405824005af40765b Merge: 72a813a4252fe622ebdfd5caa948e91a767959e6 c3ed16a64c0b0a5b116c9753bf48496d49daffb5 Author: David S. Miller <davem(a)davemloft.net> Date: Sat Nov 18 17:40:34 2023 +0000 Merge tag 'batadv-next-pullrequest-20231115' of git://git.open-mesh.org/linux-merge This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Implement new multicast packet type, including its transmission, forwarding and parsing, by Linus Lüssing (3 patches) - Switch to new headers for sprintf and array size, by Sven Eckelmann (2 patches) Signed-off-by: David S. Miller <davem(a)davemloft.net> -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.14.335, created. v4.14.335
by postmaster＠open-mesh.org 10 Jan '24

10 Jan '24

The annotated tag, v4.14.335 has been created at 38c898b81cb370feff7b2fe1d7eb404b301f7ed1 (tag) tagging 11fc60f0cd74e31678de16e01650f4538bc57a99 (commit) replaces v4.14.334 tagged by Greg Kroah-Hartman on Mon Jan 8 11:25:10 2024 +0100 - Shortlog ------------------------------------------------------------ This is the 4.14.335 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmWbzYYACgkQONu9yGCS aT5yuA//cfIIRarmgTer4zke1a3IvizQR8mIR8dELEimi0Zcws6ZrLa3Dr6CXhEc olKM5OtMypYU/VjlAb4j8PMLoGzHoUxZo1sbBwQ3JhmPU0JpKPM5R/W+GE1+++Se 1Wgqv1r5/DXsPEI6Tmn1a0W2B/oTe7hLdCWoCpQUmgYeIBF63Ayh5c4a1jyCJHuv zb4JJR2WteUiZ3A7E3UvjSNR1ydwKXH3Prb3zuhqtwo5AWy7Xzot3U34IXEUYNkL D1I+5JwGullBJUqHS86Fn6geAo51+H+faO9u8C8HwusnxXxpX6YymhuW49yX+DVI B+cEBh0itKZJPeIRYk3Gr4kJ2qP9xn3pxvF1xHYiBrQtcp5feVuth0lqyo7n1YPp Uca7Ap6GzLKalZA6sK3ZpJLUFSA4yj84VJzp9b3wC0QztRuSGkVeAEXSAdF/kVDM YCjWjIXlLj1A/vQ1HQC5wOKcrn6P04so4uRMVN7LukSdJFn9yuk4v6ZxMoKCPBJc Z8U0dF1hGgWjwe3ggdWOnfqOKti2EJ6+OmSsJkPoWS0zk9q3pSknQ56XgB+ejIBQ OLl93RKrkojO4xR1U7rPl2Qhbat2Q0NY4mj0ZxLGTX/Nxo0SyKuX+d9t+cDRbRzP lGNjjQlfeP2IXHLluqxNea+2sc86m7ce9gyJ3D/6SEcnE2plWi8= =Y9Wv -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits