commits August 2020

commits@lists.open-mesh.org

1 participants
54 discussions

[batman-adv] maint's head updated: batman-adv: Fix own OGM check in aggregated OGMs (d41cc7cb)
by postmaster＠open-mesh.org 01 Aug '20

01 Aug '20

Repository : ssh://git@diktynna/batman-adv Branch 'maint' now includes: fcdf008f batman-adv: Avoid uninitialized chaddr when handling DHCP d41cc7cb batman-adv: Fix own OGM check in aggregated OGMs

1 0

[batman-adv] master: Merge branch 'maint' (eded19e9)
by postmaster＠open-mesh.org 01 Aug '20

01 Aug '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit eded19e9bb1bd8152480e230a49eaab9dd70878c Merge: 921f23df d41cc7cb Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 1 06:02:36 2020 +0200 Merge branch 'maint' >--------------------------------------------------------------- eded19e9bb1bd8152480e230a49eaab9dd70878c net/batman-adv/bat_v_ogm.c | 11 ++++++----- net/batman-adv/gateway_client.c | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-)

1 0

[batman-adv] master: batman-adv: Fix own OGM check in aggregated OGMs (d41cc7cb)
by postmaster＠open-mesh.org 01 Aug '20

01 Aug '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit d41cc7cb62c184b2fb8ab97fda45815918200001 Author: Linus L��ssing <linus.luessing(a)c0d3.blue> Date: Fri Jul 31 00:22:55 2020 +0200 batman-adv: Fix own OGM check in aggregated OGMs The own OGM check is currently misplaced and can lead to the following issues: For one thing we might receive an aggregated OGM from a neighbor node which has our own OGM in the first place. We would then not only skip our own OGM but erroneously also any other, following OGM in the aggregate. For another, we might receive an OGM aggregate which has our own OGM in a place other then the first one. Then we would wrongly not skip this OGM, leading to populating the orginator and gateway table with ourself. The latter seems to not only be a cosmetic issue, but there were reports that this causes issues with various subsystems of batman-adv, too. For instance there were reports about issues with DAT and either disabling DAT or aggregation seemed to solve it. Fixing these issues by applying the own OGM check not on the first OGM in an aggregate but for each OGM in an aggregate instead. Fixes: 667996ebeab ("batman-adv: OGMv2 - implement originators logic") Signed-off-by: Linus L��ssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d41cc7cb62c184b2fb8ab97fda45815918200001 net/batman-adv/bat_v_ogm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 18028b9f..65b1280c 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -874,6 +874,12 @@ static void batadv_v_ogm_process(const struct sk_buff *skb, int ogm_offset, ntohl(ogm_packet->seqno), ogm_throughput, ogm_packet->ttl, ogm_packet->version, ntohs(ogm_packet->tvlv_len)); + if (batadv_is_my_mac(bat_priv, ogm_packet->orig)) { + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "Drop packet: originator packet from ourself\n"); + return; + } + /* If the throughput metric is 0, immediately drop the packet. No need * to create orig_node / neigh_node for an unusable route. */ @@ -1001,11 +1007,6 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb, if (batadv_is_my_mac(bat_priv, ethhdr->h_source)) goto free_skb; - ogm_packet = (struct batadv_ogm2_packet *)skb->data; - - if (batadv_is_my_mac(bat_priv, ogm_packet->orig)) - goto free_skb; - batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_RX); batadv_add_counter(bat_priv, BATADV_CNT_MGMT_RX_BYTES, skb->len + ETH_HLEN);

1 0

[batman-adv] master: batman-adv: Avoid uninitialized chaddr when handling DHCP (fcdf008f)
by postmaster＠open-mesh.org 01 Aug '20

01 Aug '20

Repository : ssh://git@diktynna/batman-adv On branch : master >--------------------------------------------------------------- commit fcdf008ffd749246632d1f9423163af5dc3f8c7f Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jul 22 20:49:23 2020 +0200 batman-adv: Avoid uninitialized chaddr when handling DHCP The gateway client code can try to optimize the delivery of DHCP packets to avoid broadcasting them through the whole mesh. But also transmissions to the client can be optimized by looking up the destination via the chaddr of the DHCP packet. But the chaddr is currently only done when chaddr is fully inside the non-paged area of the skbuff. Otherwise it will not be initialized and the unoptimized path should have been taken. But the implementation didn't handle this correctly. It didn't retrieve the correct chaddr but still tried to perform the TT lookup with this uninitialized memory. Reported-by: syzbot+ab16e463b903f5a37036(a)syzkaller.appspotmail.com Fixes: 2d5b555644b2 ("batman-adv: send every DHCP packet as bat-unicast") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <a(a)unstable.cc> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- fcdf008ffd749246632d1f9423163af5dc3f8c7f net/batman-adv/gateway_client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index a18dcc68..ef3f85b5 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -703,8 +703,10 @@ batadv_gw_dhcp_recipient_get(struct sk_buff *skb, unsigned int *header_len, chaddr_offset = *header_len + BATADV_DHCP_CHADDR_OFFSET; /* store the client address if the message is going to a client */ - if (ret == BATADV_DHCP_TO_CLIENT && - pskb_may_pull(skb, chaddr_offset + ETH_ALEN)) { + if (ret == BATADV_DHCP_TO_CLIENT) { + if (!pskb_may_pull(skb, chaddr_offset + ETH_ALEN)) + return BATADV_DHCP_NO; + /* check if the DHCP packet carries an Ethernet DHCP */ p = skb->data + *header_len + BATADV_DHCP_HTYPE_OFFSET; if (*p != BATADV_DHCP_HTYPE_ETHERNET)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits August 2020