linux-merge

linux-merge@lists.open-mesh.org

3 participants
7427 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20241213
by batman＠open-mesh.org 13 Dec '24

13 Dec '24

The following commit has been merged in the master branch: commit 8038806db64da15721775d6b834990cacbfcf0b2 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: 7ea7b4a14275 ("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> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 996d1f01171ad..f5201738628ce 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -2712,14 +2712,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; @@ -2733,7 +2735,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++) { @@ -2759,6 +2761,8 @@ static void batadv_tt_tvlv_generate(struct batadv_priv *bat_priv, } } rcu_read_unlock(); + + return batadv_tt_len(tt_tot - tt_num_entries); } /** @@ -3029,10 +3033,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. */ @@ -3156,9 +3161,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; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20241213
by batman＠open-mesh.org 13 Dec '24

13 Dec '24

The following commit has been merged in the master branch: commit fff8f17c1a6fc802ca23bbd3a276abfde8cc58e6 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: e1bf0c14096f ("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> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index f5201738628ce..760d51fdbdf60 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -948,6 +948,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; @@ -955,10 +956,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); @@ -967,7 +975,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); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20241213
by batman＠open-mesh.org 13 Dec '24

13 Dec '24

The following commit has been merged in the master branch: commit f2f7358c3890e7366cbcb7512b4bc8b4394b2d61 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: e1bf0c14096f ("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> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index b44c382226a11..996d1f01171ad 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -948,6 +948,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); @@ -985,6 +986,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); @@ -993,6 +997,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 */ @@ -1005,6 +1010,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); -- LinuxNextTracking

1 0

Build check errors found: 2024-12-13
by postmaster＠open-mesh.org 13 Dec '24

13 Dec '24

1 0

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

12 Dec '24

Name of failed tests ==================== stable ------ * difference between net and batadv stable main ---- * coccicheck * difference between net-next and batadv main * headers Output of different failed tests ================================ main: coccicheck ---------------- ./bridge_loop_avoidance.c:1499:8-27: WARNING: atomic_dec_and_test variation before object free at line 1510. stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/main.h | 2 net/net/batman-adv/translation-table.c | 58 +++++++----------------- 2 files changed, 19 insertions(+), 41 deletions(-) main: difference between net-next and batadv main ------------------------------------------------- netnext/net/batman-adv/distributed-arp-table.c | 2 netnext/net/batman-adv/soft-interface.c | 2 netnext/net/batman-adv/translation-table.c | 120 ++++++---------- netnext/net/batman-adv/types.h | 4 4 files changed, 56 insertions(+), 72 deletions(-) main: headers ------------- diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 73a87c78..534d8953 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -67,3 +67,5 @@ TRACE_EVENT(batadv_dbg, /* This part must be outside protection */ #include <trace/define_trace.h> + +#include "linux/preempt.h" Statistics ========== stable ------ Failed tests: 1 Started build tests: 214 Tested Linux versions: 36 Tested configs: 108 main ---- Failed tests: 3 Started build tests: 203 Tested Linux versions: 35 Tested configs: 105

1 0

Build check errors found: 2024-12-11
by postmaster＠open-mesh.org 11 Dec '24

11 Dec '24

Name of failed tests ==================== main ---- * coccicheck * difference between net-next and batadv main * headers stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: coccicheck ---------------- ./bridge_loop_avoidance.c:1499:8-27: WARNING: atomic_dec_and_test variation before object free at line 1510. stable: difference between net and batadv stable ------------------------------------------------ net/net/batman-adv/main.h | 2 net/net/batman-adv/translation-table.c | 58 +++++++----------------- 2 files changed, 19 insertions(+), 41 deletions(-) main: difference between net-next and batadv main ------------------------------------------------- netnext/net/batman-adv/distributed-arp-table.c | 2 netnext/net/batman-adv/soft-interface.c | 2 netnext/net/batman-adv/translation-table.c | 120 ++++++---------- netnext/net/batman-adv/types.h | 4 4 files changed, 56 insertions(+), 72 deletions(-) main: headers ------------- diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 73a87c78..534d8953 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -67,3 +67,5 @@ TRACE_EVENT(batadv_dbg, /* This part must be outside protection */ #include <trace/define_trace.h> + +#include "linux/preempt.h" Statistics ========== main ---- Failed tests: 3 Started build tests: 204 Tested Linux versions: 36 Tested configs: 104 stable ------ Failed tests: 1 Started build tests: 229 Tested Linux versions: 36 Tested configs: 106

1 0

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

10 Dec '24

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

1 0

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

10 Dec '24

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

1 0

Build check errors found: 2024-12-10
by postmaster＠open-mesh.org 10 Dec '24

10 Dec '24

Name of failed tests ==================== main ---- * coccicheck * difference between net-next and batadv main * headers stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: coccicheck ---------------- ./bridge_loop_avoidance.c:1499:8-27: WARNING: atomic_dec_and_test variation before object free at line 1510. stable: difference between net and batadv stable ------------------------------------------------ net/include/uapi/linux/batadv_packet.h | 29 ++- net/net/batman-adv/bat_iv_ogm.c | 4 net/net/batman-adv/bridge_loop_avoidance.c | 8 - net/net/batman-adv/translation-table.c | 154 +++++--------------- 4 files changed, 63 insertions(+), 132 deletions(-) main: difference between net-next and batadv main ------------------------------------------------- netnext/net/batman-adv/translation-table.c | 58 ++++++-------------- 1 file changed, 18 insertions(+), 40 deletions(-) main: headers ------------- diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 3762bc8d..67481be6 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -7,7 +7,6 @@ #include "distributed-arp-table.h" #include "main.h" // IWYU pragma: keep -#include <linux/unaligned.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> @@ -32,6 +31,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/udp.h> +#include <linux/unaligned.h> #include <linux/workqueue.h> #include <net/arp.h> #include <net/genetlink.h> diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 73a87c78..534d8953 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -67,3 +67,5 @@ TRACE_EVENT(batadv_dbg, /* This part must be outside protection */ #include <trace/define_trace.h> + +#include "linux/preempt.h" Statistics ========== main ---- Failed tests: 3 Started build tests: 198 Tested Linux versions: 36 Tested configs: 103 stable ------ Failed tests: 1 Started build tests: 217 Tested Linux versions: 36 Tested configs: 107

1 0

Build check errors found: 2024-12-09
by postmaster＠open-mesh.org 09 Dec '24

09 Dec '24

Name of failed tests ==================== main ---- * coccicheck * difference between net-next and batadv main * headers stable ------ * difference between net and batadv stable Output of different failed tests ================================ main: coccicheck ---------------- ./bridge_loop_avoidance.c:1499:8-27: WARNING: atomic_dec_and_test variation before object free at line 1510. stable: difference between net and batadv stable ------------------------------------------------ net/include/uapi/linux/batadv_packet.h | 29 ++- net/net/batman-adv/bat_iv_ogm.c | 4 net/net/batman-adv/bridge_loop_avoidance.c | 8 - net/net/batman-adv/translation-table.c | 154 +++++--------------- 4 files changed, 63 insertions(+), 132 deletions(-) main: difference between net-next and batadv main ------------------------------------------------- netnext/net/batman-adv/translation-table.c | 58 ++++++-------------- 1 file changed, 18 insertions(+), 40 deletions(-) main: headers ------------- diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 3762bc8d..67481be6 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -7,7 +7,6 @@ #include "distributed-arp-table.h" #include "main.h" // IWYU pragma: keep -#include <linux/unaligned.h> #include <linux/atomic.h> #include <linux/bitops.h> #include <linux/byteorder/generic.h> @@ -32,6 +31,7 @@ #include <linux/stddef.h> #include <linux/string.h> #include <linux/udp.h> +#include <linux/unaligned.h> #include <linux/workqueue.h> #include <net/arp.h> #include <net/genetlink.h> diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h index 73a87c78..534d8953 100644 --- a/net/batman-adv/trace.h +++ b/net/batman-adv/trace.h @@ -67,3 +67,5 @@ TRACE_EVENT(batadv_dbg, /* This part must be outside protection */ #include <trace/define_trace.h> + +#include "linux/preempt.h" Statistics ========== main ---- Failed tests: 3 Started build tests: 173 Tested Linux versions: 36 Tested configs: 96 stable ------ Failed tests: 1 Started build tests: 186 Tested Linux versions: 35 Tested configs: 106

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge