commits December 2024

commits@lists.open-mesh.org

1 participants
40 discussions

[linux-merge]linux integration; annotated tag, v6.12.2, created. v6.12.2
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The annotated tag, v6.12.2 has been created at d1ae330586841b43f4c9d7ce9165cb80c3814bf7 (tag) tagging fa10f348fd80c7ea7b7c0a7763ba7c0bf1a16be3 (commit) replaces v6.12 tagged by Greg Kroah-Hartman on Thu Dec 5 14:04:29 2024 +0100 - Shortlog ------------------------------------------------------------ This is the 6.12.2 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmdRpN0ACgkQONu9yGCS aT4gGQ//aGtoYKT8ddzsgUEDMiQIYtC28ysvD5MTEq/zZdbOEcSA8uvrlhVJ43i0 3MK71u307hrmLpd7c4kUuxi5ljLHJysYAAWSo3qEF+MWitdZ/1gEKKai01ZVNbrb Zrglwexn4vMkRrXdAzKrM0QJza0LZOASKjFveLOH+UstqeL/PPF2m+9Z4zBdEo4D fEPRHlCD1uvxg7X8y6Cb9A/nfyADhOl4CTSQwOy1z2y1YUZGI4uOhDooyj4D+mVO vA9g1MQmeQIgwJIXhTkplN/tWPileAszSR1I/Iu/wRy9hrEaB4O+mmBgXXKUpSVS 2fZawQxCW4x2GzVp93C2HwmWa3Zjs+fpKL0RB7kh/C0MVi6JGH47IMo3aDxGdvdW HdKDVTPx4R7Df38KbLh8xaySlnWdkzaEoFmUc21PkBFYkJUAVBCedAj2oymk/+u3 9hpcPLESzwVusrKcI3OPXHOrj8Oa5f6vhaG85pdd6H7v7BWPR+RXj5O7lpXZY/wU rBnnaXA0xBOqgeW59XOK2x6NJCWYawyIZI/lJJPTxOdiWjumTfI1sAvV3jEMjEIt Vskx9axwYZr0Yl3pEMKYCfUzCgJW2yN8d1smRrJgpO5YwM8PKPghYw5NdRMwPbWv 0EZR5YSW9izA2q/lX2H31adU2srDYGxSN2JGHY0olr/5Anu5UFA= =N1Cq -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v6.6.63, created. v6.6.63
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The annotated tag, v6.6.63 has been created at 54458e01a52ea3adc68fc266add59048b0befddb (tag) tagging bff3e13adb72656356111d2549d8be7c872d6e15 (commit) replaces v6.6.62 tagged by Greg Kroah-Hartman on Fri Nov 22 15:39:03 2024 +0100 - Shortlog ------------------------------------------------------------ This is the 6.6.63 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmdAl4gACgkQONu9yGCS aT6iCBAAqTvp0BGFFl+7pVb9SpCxaxleK3tzs1X3q6dZpk1p6bI34GCHMlWGQZRR Iy1DzLcmrJd22frPOZ3PZyWOpAvz7VcU9I/2PhNfG4Ge3aPw0Q9Cs6I+9E51msJA njRIDUcozBTX1dsQV/g56Pzefvq+W0X1Z6XlipAYqcZRrJHkZoL6WL4vgmpEFdEf Nk3u3QT67vALCnIxbtm7h2NZSwWFpRbW1VXDe0R7bxWb8q0ZRIsgoJiUroZatx4Y YejggnVNjRHqytSuNqHF8BtJzGHRD/0n+IMUih3oVSLLkzZSLriaWXGuXzQGpzDG FTDHyu77I12f5HSv5ftc2dMupb6RL9ICR1uuc/WppjWgP5xLd2ULSlwlaKQsk6IF v2wdzlOol15TDKqi+D4D1p+eUeSqzMUDYalAUAlX3/gOr69/2EYhgqwsND5NdXFJ NqKadL29R3a4DT/NOLqklLcUQlRBTwkQnV4k167+YKjwC6EYOrHFzr6xqKeqD+Dr OpNg5rKM7HB0VGobvw++uwHHSMYkdLeuSUNdFzEU2tL0N1YqlNxKs0YtrbOT0l1q l7VCOSzHHkkYmyRU+zfo2k5LtUSROSGM5qqkHFQvpA/ikFWahIMyjiAlxjkO6pgm vCGQnYSV0lO4Vsa5F131fkwGA0LTBFFRymUGN+QMIvj0jtUFADA= =EXuo -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v6.1.119, created. v6.1.119
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

The annotated tag, v6.1.119 has been created at 93242a5e8f581c359b6a2119565d24390e62b411 (tag) tagging e4d90d63d385228b1e0bcf31cc15539bbbc28f7f (commit) replaces v6.1.118 tagged by Greg Kroah-Hartman on Fri Nov 22 15:37:44 2024 +0100 - Shortlog ------------------------------------------------------------ This is the 6.1.119 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmdAlzgACgkQONu9yGCS aT42uQ//dtRiaR95GtZ741kjEp3bGCYbSvhQsnCF2O5Ft1ajd7zenog2oZ83Xvnk JGZwtRvLrBvYekBFHiftF0i0vCxmLPQVx+GUIqCFU/ZZdITw+n99DH/zfl9soXmh 0DpZqNos0TkBdPmw0vYB+mIibAjG5brMwfdrXy5U0T1lrw1EeaUxat05fMBiF5XO vSK450RgzGa7h+8jUyK4eR7P+aUjNoUl3XZstFK1YzbVznXomvmXGFB0Xt3KIFEZ 5waNFJnYkkB/W9IgrcXNtskPUwh3wJ0RltavQcwnCIeRUCousW+tFPn9OGHbOC9V VJGiIuzGIQYEY71Ds7O6CD/3EXWs3fn1qJUU40IvJJvhh5z8G3zJWGXolaIJqLzW EkfzXF+mtMzjPm+IR2UrGtVMvDEOi7CdBVGDUrxqRiSrZvBKgu4zbF1ZiDI49hcP GuYgcPbEF28W4DoABhbzDMvIkyuyFvBInFHnI04KFlHsGMx14Y6FaMtoOz8g8z+0 NX43nyL2JiWsSSmiViRJlP2cIdqjZb+c0CdunTo6w/Ho4rnRbaiL3Mggt70CBMCM /yUCLNcx0c/sEwb0YF+JNAjqGmhVm+aUZ3CRqjPSN44k4wu6TaokhWnaB9g83KP8 BvpGK0LWnS2whCHS0SkM96Pp5QYXDoQnRJmw/xo+oYwu4/+dK2s= =No10 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] main,main: batman-adv: Drop support for Linux < 5.4 (4c4a6026)
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit 4c4a602658bcf7eb0dc92453c7e3ff4c6ef2680e Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 5 21:53:11 2024 +0100 batman-adv: Drop support for Linux < 5.4 The Linux Kernel 4.14 reached its end of life [1] after 6 years. Instead it is recommended to use at least kernel 5.5. It is also over 5 years old but still maintained by the stable kernel team. All older kernels (4.19 - v5.3) will be dropped to reduce the support overhead. [1] https://lore.kernel.org/lkml/2024120520-preorder-untracked-6e5b@gregkh/T/ Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4c4a602658bcf7eb0dc92453c7e3ff4c6ef2680e README.external.rst | 2 +- compat-include/linux/compiler.h | 28 ---------------------------- compat-include/linux/igmp.h | 28 ---------------------------- compat-include/linux/skbuff.h | 22 ---------------------- compat-include/net/addrconf.h | 12 ------------ compat-include/net/genetlink.h | 14 -------------- 6 files changed, 1 insertion(+), 105 deletions(-) diff --git a/README.external.rst b/README.external.rst index 8a174006..6d7c7c83 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.19 - 6.12. Supporting older versions is not +with Linux 5.4 - 6.12. 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/compiler.h b/compat-include/linux/compiler.h deleted file mode 100644 index 7175cef9..00000000 --- a/compat-include/linux/compiler.h +++ /dev/null @@ -1,28 +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_COMPILER_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ - -#include <linux/version.h> -#include_next <linux/compiler.h> - -#if LINUX_VERSION_IS_LESS(5, 4, 0) - -#ifndef fallthrough -#if __GNUC__ > 7 && !defined(__CHECKER__) -# define fallthrough __attribute__((__fallthrough__)) -#else -# define fallthrough do {} while (0) /* fallthrough */ -#endif -#endif - -#endif /* LINUX_VERSION_IS_LESS(5, 4, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ diff --git a/compat-include/linux/igmp.h b/compat-include/linux/igmp.h deleted file mode 100644 index ce21047e..00000000 --- a/compat-include/linux/igmp.h +++ /dev/null @@ -1,28 +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_IGMP_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_IGMP_H_ - -#include <linux/version.h> -#include_next <linux/igmp.h> - -#if LINUX_VERSION_IS_LESS(5, 1, 0) - -static inline int batadv_ip_mc_check_igmp(struct sk_buff *skb) -{ - return ip_mc_check_igmp(skb, NULL); -} - -#define ip_mc_check_igmp(skb) \ - batadv_ip_mc_check_igmp(skb) - -#endif /* LINUX_VERSION_IS_LESS(5, 1, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IGMP_H_ */ diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h deleted file mode 100644 index eda2d181..00000000 --- a/compat-include/linux/skbuff.h +++ /dev/null @@ -1,22 +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_SKBUFF_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ - -#include <linux/version.h> -#include_next <linux/skbuff.h> - -#if LINUX_VERSION_IS_LESS(5, 4, 0) - -#define nf_reset_ct nf_reset - -#endif /* LINUX_VERSION_IS_LESS(5, 4, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ */ diff --git a/compat-include/net/addrconf.h b/compat-include/net/addrconf.h index 080e1dda..18a02531 100644 --- a/compat-include/net/addrconf.h +++ b/compat-include/net/addrconf.h @@ -13,18 +13,6 @@ #include <linux/version.h> #include_next <net/addrconf.h> -#if LINUX_VERSION_IS_LESS(5, 1, 0) - -static inline int batadv_ipv6_mc_check_mld(struct sk_buff *skb) -{ - return ipv6_mc_check_mld(skb, NULL); -} - -#define ipv6_mc_check_mld(skb) \ - batadv_ipv6_mc_check_mld(skb) - -#endif /* LINUX_VERSION_IS_LESS(5, 1, 0) */ - #if LINUX_VERSION_IS_LESS(5, 13, 0) static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr, diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 85376044..91c4c0b2 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -15,14 +15,6 @@ #if LINUX_VERSION_IS_LESS(5, 10, 0) -#if LINUX_VERSION_IS_LESS(5, 2, 0) -enum genl_validate_flags { - GENL_DONT_VALIDATE_STRICT = BIT(0), - GENL_DONT_VALIDATE_DUMP = BIT(1), - GENL_DONT_VALIDATE_DUMP_STRICT = BIT(2), -}; -#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */ - struct batadv_genl_small_ops { int (*doit)(struct sk_buff *skb, struct genl_info *info); @@ -93,16 +85,10 @@ static inline int batadv_genl_register_family(struct batadv_genl_family *family) ops[i].cmd = family->small_ops[i].cmd; ops[i].internal_flags = family->small_ops[i].internal_flags; ops[i].flags = family->small_ops[i].flags; -#if LINUX_VERSION_IS_GEQ(5, 2, 0) ops[i].validate = family->small_ops[i].validate; -#else - ops[i].policy = family->policy; -#endif } -#if LINUX_VERSION_IS_GEQ(5, 2, 0) family->family.policy = family->policy; -#endif family->family.ops = ops; family->copy_ops = ops;

1 0

[batman-adv] main,main: batman-adv: Drop support for Linux < 4.19 (b04ef228)
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit b04ef22889ad1a0275616deeadd2ed68a8e253fd Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 5 21:53:11 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 5.5. It is also over 5 years old but still maintained by the stable kernel team. All older kernels (4.19 - v5.3) will be dropped to reduce the support overhead. [1] https://lore.kernel.org/lkml/2024120520-preorder-untracked-6e5b@gregkh/T/ Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- b04ef22889ad1a0275616deeadd2ed68a8e253fd README.external.rst | 2 +- compat-include/linux/compiler.h | 28 ---------------------------- compat-include/linux/igmp.h | 28 ---------------------------- compat-include/linux/skbuff.h | 22 ---------------------- compat-include/net/addrconf.h | 12 ------------ compat-include/net/genetlink.h | 14 -------------- 6 files changed, 1 insertion(+), 105 deletions(-) diff --git a/README.external.rst b/README.external.rst index 8a174006..6d7c7c83 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.19 - 6.12. Supporting older versions is not +with Linux 5.4 - 6.12. 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/compiler.h b/compat-include/linux/compiler.h deleted file mode 100644 index 7175cef9..00000000 --- a/compat-include/linux/compiler.h +++ /dev/null @@ -1,28 +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_COMPILER_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ - -#include <linux/version.h> -#include_next <linux/compiler.h> - -#if LINUX_VERSION_IS_LESS(5, 4, 0) - -#ifndef fallthrough -#if __GNUC__ > 7 && !defined(__CHECKER__) -# define fallthrough __attribute__((__fallthrough__)) -#else -# define fallthrough do {} while (0) /* fallthrough */ -#endif -#endif - -#endif /* LINUX_VERSION_IS_LESS(5, 4, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ diff --git a/compat-include/linux/igmp.h b/compat-include/linux/igmp.h deleted file mode 100644 index ce21047e..00000000 --- a/compat-include/linux/igmp.h +++ /dev/null @@ -1,28 +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_IGMP_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_IGMP_H_ - -#include <linux/version.h> -#include_next <linux/igmp.h> - -#if LINUX_VERSION_IS_LESS(5, 1, 0) - -static inline int batadv_ip_mc_check_igmp(struct sk_buff *skb) -{ - return ip_mc_check_igmp(skb, NULL); -} - -#define ip_mc_check_igmp(skb) \ - batadv_ip_mc_check_igmp(skb) - -#endif /* LINUX_VERSION_IS_LESS(5, 1, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IGMP_H_ */ diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h deleted file mode 100644 index eda2d181..00000000 --- a/compat-include/linux/skbuff.h +++ /dev/null @@ -1,22 +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_SKBUFF_H_ -#define _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ - -#include <linux/version.h> -#include_next <linux/skbuff.h> - -#if LINUX_VERSION_IS_LESS(5, 4, 0) - -#define nf_reset_ct nf_reset - -#endif /* LINUX_VERSION_IS_LESS(5, 4, 0) */ - -#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ */ diff --git a/compat-include/net/addrconf.h b/compat-include/net/addrconf.h index 080e1dda..18a02531 100644 --- a/compat-include/net/addrconf.h +++ b/compat-include/net/addrconf.h @@ -13,18 +13,6 @@ #include <linux/version.h> #include_next <net/addrconf.h> -#if LINUX_VERSION_IS_LESS(5, 1, 0) - -static inline int batadv_ipv6_mc_check_mld(struct sk_buff *skb) -{ - return ipv6_mc_check_mld(skb, NULL); -} - -#define ipv6_mc_check_mld(skb) \ - batadv_ipv6_mc_check_mld(skb) - -#endif /* LINUX_VERSION_IS_LESS(5, 1, 0) */ - #if LINUX_VERSION_IS_LESS(5, 13, 0) static bool batadv_mcast_mla_is_duplicate(u8 *mcast_addr, diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index 85376044..91c4c0b2 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -15,14 +15,6 @@ #if LINUX_VERSION_IS_LESS(5, 10, 0) -#if LINUX_VERSION_IS_LESS(5, 2, 0) -enum genl_validate_flags { - GENL_DONT_VALIDATE_STRICT = BIT(0), - GENL_DONT_VALIDATE_DUMP = BIT(1), - GENL_DONT_VALIDATE_DUMP_STRICT = BIT(2), -}; -#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */ - struct batadv_genl_small_ops { int (*doit)(struct sk_buff *skb, struct genl_info *info); @@ -93,16 +85,10 @@ static inline int batadv_genl_register_family(struct batadv_genl_family *family) ops[i].cmd = family->small_ops[i].cmd; ops[i].internal_flags = family->small_ops[i].internal_flags; ops[i].flags = family->small_ops[i].flags; -#if LINUX_VERSION_IS_GEQ(5, 2, 0) ops[i].validate = family->small_ops[i].validate; -#else - ops[i].policy = family->policy; -#endif } -#if LINUX_VERSION_IS_GEQ(5, 2, 0) family->family.policy = family->policy; -#endif family->family.ops = ops; family->copy_ops = ops;

1 0

[batman-adv] main,main: Merge branch 'stable' (c1a6b008)
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,main >--------------------------------------------------------------- commit c1a6b008ef88c62ab3b6bfdfef064c9c42fde789 Merge: d6b622d1 4d49d6e9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 5 18:53:57 2024 +0100 Merge branch 'stable' >--------------------------------------------------------------- c1a6b008ef88c62ab3b6bfdfef064c9c42fde789 net/batman-adv/translation-table.c | 58 ++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 18 deletions(-)

1 0

[batman-adv] main,stable,main,stable: batman-adv: Do not send uninitialized TT changes (5fe3a7a4)
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,stable,main,stable >--------------------------------------------------------------- commit 5fe3a7a48ea6374280dc855db7b802d70b1870c6 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:48 2024 +0100 batman-adv: Do not send uninitialized TT changes The number of TT changes can be less than initially expected in batadv_tt_tvlv_container_update() (changes can be removed by batadv_tt_local_event() in ADD+DEL sequence between reading tt_diff_entries_num and actually iterating the change list under lock). Thus tt_diff_len could be bigger than the actual changes size that need to be sent. Because batadv_send_my_tt_response sends the whole packet, uninitialized data can be interpreted as TT changes on other nodes leading to weird TT global entries on those nodes such as: * 00:00:00:00:00:00 -1 [....] ( 0) 88:12:4e:ad:7e:ba (179) (0x45845380) * 00:00:00:00:78:79 4092 [.W..] ( 0) 88:12:4e:ad:7e:3c (145) (0x8ebadb8b) All of the above also applies to OGM tvlv container buffer's tvlv_len. Remove the extra allocated space to avoid sending uninitialized TT changes in batadv_send_my_tt_response() and batadv_v_ogm_send_softif(). Fixes: 8405301b9794 ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5fe3a7a48ea6374280dc855db7b802d70b1870c6 net/batman-adv/translation-table.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 2243cec1..f0590f9b 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -990,6 +990,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + size_t tt_extra_len = 0; u16 tvlv_len; tt_diff_entries_num = atomic_read(&bat_priv->tt.local_changes); @@ -1027,6 +1028,9 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) } spin_unlock_bh(&bat_priv->tt.changes_list_lock); + tt_extra_len = batadv_tt_len(tt_diff_entries_num - + tt_diff_entries_count); + /* Keep the buffer for possible tt_request */ spin_lock_bh(&bat_priv->tt.last_changeset_lock); kfree(bat_priv->tt.last_changeset); @@ -1035,6 +1039,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_change_len = batadv_tt_len(tt_diff_entries_count); /* check whether this new OGM has no changes due to size problems */ if (tt_diff_entries_count > 0) { + tt_diff_len -= tt_extra_len; /* if kmalloc() fails we will reply with the full table * instead of providing the diff */ @@ -1047,6 +1052,8 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) } spin_unlock_bh(&bat_priv->tt.last_changeset_lock); + /* Remove extra packet space for OGM */ + tvlv_len -= tt_extra_len; container_register: batadv_tvlv_container_register(bat_priv, BATADV_TVLV_TT, 1, tt_data, tvlv_len);

1 0

[batman-adv] main,stable,main,stable: batman-adv: Remove uninitialized data in full table TT response (095c3965)
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,stable,main,stable >--------------------------------------------------------------- commit 095c3965bdc29e43546a9cdd21f179f952e01f48 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:49 2024 +0100 batman-adv: Remove uninitialized data in full table TT response The number of entries filled by batadv_tt_tvlv_generate() can be less than initially expected in batadv_tt_prepare_tvlv_{global,local}_data() (changes can be removed by batadv_tt_local_event() in ADD+DEL sequence in the meantime as the lock held during the whole tvlv global/local data generation). Thus tvlv_len could be bigger than the actual TT entry size that need to be sent so full table TT_RESPONSE could hold invalid TT entries such as below. * 00:00:00:00:00:00 -1 [....] ( 0) 88:12:4e:ad:7e:ba (179) (0x45845380) * 00:00:00:00:78:79 4092 [.W..] ( 0) 88:12:4e:ad:7e:3c (145) (0x8ebadb8b) Remove the extra allocated space to avoid sending uninitialized entries for full table TT_RESPONSE in both batadv_send_other_tt_response() and batadv_send_my_tt_response(). Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 095c3965bdc29e43546a9cdd21f179f952e01f48 net/batman-adv/translation-table.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f0590f9b..bbab7491 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2754,14 +2754,16 @@ static bool batadv_tt_global_valid(const void *entry_ptr, * * Fills the tvlv buff with the tt entries from the specified hash. If valid_cb * is not provided then this becomes a no-op. + * + * Return: Remaining unused length in tvlv_buff. */ -static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, - struct batadv_hashtable *hash, - void *tvlv_buff, u16 tt_len, - bool (*valid_cb)(const void *, - const void *, - u8 *flags), - void *cb_data) +static u16 batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, + struct batadv_hashtable *hash, + void *tvlv_buff, u16 tt_len, + bool (*valid_cb)(const void *, + const void *, + u8 *flags), + void *cb_data) { struct batadv_tt_common_entry *tt_common_entry; struct batadv_tvlv_tt_change *tt_change; @@ -2775,7 +2777,7 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, tt_change = tvlv_buff; if (!valid_cb) - return; + return tt_len; rcu_read_lock(); for (i = 0; i < hash->size; i++) { @@ -2801,6 +2803,8 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, } } rcu_read_unlock(); + + return batadv_tt_len(tt_tot - tt_num_entries); } /** @@ -3076,10 +3080,11 @@ static bool batadv_send_other_tt_response(struct batadv_priv *bat_priv, goto out; /* fill the rest of the tvlv with the real TT entries */ - batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.global_hash, - tt_change, tt_len, - batadv_tt_global_valid, - req_dst_orig_node); + tvlv_len -= batadv_tt_tvlv_generate(bat_priv, + bat_priv->tt.global_hash, + tt_change, tt_len, + batadv_tt_global_valid, + req_dst_orig_node); } /* Don't send the response, if larger than fragmented packet. */ @@ -3203,9 +3208,11 @@ static bool batadv_send_my_tt_response(struct batadv_priv *bat_priv, goto out; /* fill the rest of the tvlv with the real TT entries */ - batadv_tt_tvlv_generate(bat_priv, bat_priv->tt.local_hash, - tt_change, tt_len, - batadv_tt_local_valid, NULL); + tvlv_len -= batadv_tt_tvlv_generate(bat_priv, + bat_priv->tt.local_hash, + tt_change, tt_len, + batadv_tt_local_valid, + NULL); } tvlv_tt_data->flags = BATADV_TT_RESPONSE;

1 0

[batman-adv] main,stable,main,stable: batman-adv: Do not let TT changes list grows indefinitely (4d49d6e9)
by postmaster＠open-mesh.org 05 Dec '24

05 Dec '24

Repository : ssh://git@diktynna/batman-adv On branches: main,stable,main,stable >--------------------------------------------------------------- commit 4d49d6e9d60c41a6da727108518cb8fb33295537 Author: Remi Pommarel <repk(a)triplefau.lt> Date: Fri Nov 22 16:52:50 2024 +0100 batman-adv: Do not let TT changes list grows indefinitely When TT changes list is too big to fit in packet due to MTU size, an empty OGM is sent expected other node to send TT request to get the changes. The issue is that tt.last_changeset was not built thus the originator was responding with previous changes to those TT requests (see batadv_send_my_tt_response). Also the changes list was never cleaned up effectively never ending growing from this point onwards, repeatedly sending the same TT response changes over and over, and creating a new empty OGM every OGM interval expecting for the local changes to be purged. When there is more TT changes that can fit in packet, drop all changes, send empty OGM and wait for TT request so we can respond with a full table instead. Fixes: 8405301b9794 ("batman-adv: tvlv - convert tt data sent within OGMs") Signed-off-by: Remi Pommarel <repk(a)triplefau.lt> Acked-by: Antonio Quartulli <Antonio(a)mandelbit.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 4d49d6e9d60c41a6da727108518cb8fb33295537 net/batman-adv/translation-table.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index bbab7491..53dea8ae 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -990,6 +990,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) int tt_diff_len, tt_change_len = 0; int tt_diff_entries_num = 0; int tt_diff_entries_count = 0; + bool drop_changes = false; size_t tt_extra_len = 0; u16 tvlv_len; @@ -997,10 +998,17 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any - * and wait for the tt table request which will be fragmented + * and wait for the tt table request so we can reply with the full + * (fragmented) table. + * + * The local change history should still be cleaned up so the next + * TT round can start again with a clean state. */ - if (tt_diff_len > bat_priv->soft_iface->mtu) + if (tt_diff_len > bat_priv->soft_iface->mtu) { tt_diff_len = 0; + tt_diff_entries_num = 0; + drop_changes = true; + } tvlv_len = batadv_tt_prepare_tvlv_local_data(bat_priv, &tt_data, &tt_change, &tt_diff_len); @@ -1009,7 +1017,7 @@ static void batadv_tt_tvlv_container_update(struct batadv_priv *bat_priv) tt_data->flags = BATADV_TT_OGM_DIFF; - if (tt_diff_len == 0) + if (!drop_changes && tt_diff_len == 0) goto container_register; spin_lock_bh(&bat_priv->tt.changes_list_lock);

1 0

[linux-merge]linux integration; annotated tag, v6.13-rc1, created. v6.13-rc1
by postmaster＠open-mesh.org 01 Dec '24

01 Dec '24

The annotated tag, v6.13-rc1 has been created at cbc4912199deab59fdbd830b115d81941d0add46 (tag) tagging 40384c840ea1944d7c5a392e8975ed088ecf0b37 (commit) replaces v6.12 tagged by Linus Torvalds on Sun Dec 1 14:28:56 2024 -0800 - Shortlog ------------------------------------------------------------ Linux 6.13-rc1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmdM4ygeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGURgIAIpjH8kH2NS3bdqK 65MBoKZ8qstZcQyo7H68sCkMyaspvDyePznmkDrWym/FyIOVg4FQ/sXes9xxLACu 2zy9WG+bAmZvpQ/xCqJZK9WklbXwvRXW5c5i+SB1kFTMhhdLqCpwxRnaQyIVMnmO dIAtJxDr1eYpOCEmibEbVfYyj9SUhBcvk4qznV5yeW50zOYzv0OJU9BwAuxkShxV NXqMpXoy1Ye5GJ2KB8u/VEccVpywR0c6bHlvaTnPZxOBxrZF/FbVQ6PzEO+j4/aX 3TWgSa5jrVwRksnll8YqIkNSWR10u3kOLgDax/S0G8opktTFIB/EiQ84AVN0Tjme PrwJSWs= =tjyG -----END PGP SIGNATURE----- Erick Archer (1): batman-adv: Add flex array to struct batadv_tvlv_tt_data Jakub Kicinski (1): Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Julia Lawall (1): batman-adv: replace call_rcu by kfree_rcu for simple kmem_cache_free callback Paolo Abeni (1): Merge tag 'batadv-next-pullrequest-20241015' of git://git.open-mesh.org/linux-merge Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (1): batman-adv: Use string choice helper to print booleans ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2024