commits June 2018

commits@lists.open-mesh.org

1 participants
19 discussions

[batman-adv] master: batman-adv: Don't redefine EPOLL* (5a7a212)
by postmaster＠open-mesh.org 29 Jun '18

29 Jun '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5a7a21260e496a064d0c6865d1d3b03a5336427a Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jun 28 21:21:41 2018 +0200 batman-adv: Don't redefine EPOLL* The commit 7e040726850a ("eventpoll.h: add missing epoll event masks") was backported to a couple of older kernels - including 4.4. The build against such kernel sources creates a lot of extra warnings about redefinitions of the different EPOLL* variables. Just disable the definition of these variables when they are already defined and drop the ones which are not used by batman-adv. Reported-by: Andre Kasper <andre.kasper(a)gmx.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5a7a21260e496a064d0c6865d1d3b03a5336427a compat-include/uapi/linux/eventpoll.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/compat-include/uapi/linux/eventpoll.h b/compat-include/uapi/linux/eventpoll.h index 1828feb..3cf71a1 100644 --- a/compat-include/uapi/linux/eventpoll.h +++ b/compat-include/uapi/linux/eventpoll.h @@ -28,18 +28,13 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) +#ifndef EPOLLIN #define EPOLLIN (__force __poll_t)0x00000001 -#define EPOLLPRI (__force __poll_t)0x00000002 -#define EPOLLOUT (__force __poll_t)0x00000004 -#define EPOLLERR (__force __poll_t)0x00000008 -#define EPOLLHUP (__force __poll_t)0x00000010 -#define EPOLLNVAL (__force __poll_t)0x00000020 +#endif + +#ifndef EPOLLRDNORM #define EPOLLRDNORM (__force __poll_t)0x00000040 -#define EPOLLRDBAND (__force __poll_t)0x00000080 -#define EPOLLWRNORM (__force __poll_t)0x00000100 -#define EPOLLWRBAND (__force __poll_t)0x00000200 -#define EPOLLMSG (__force __poll_t)0x00000400 -#define EPOLLRDHUP (__force __poll_t)0x00002000 +#endif #endif /* < KERNEL_VERSION(4, 12, 0) */

1 0

[linux-merge]linux integration; annotated tag, v4.18-rc2, created. v4.18-rc2
by postmaster＠open-mesh.org 24 Jun '18

24 Jun '18

The annotated tag, v4.18-rc2 has been created at fb87fcb6b1ae28324b266e48281eed938d6f9f42 (tag) tagging 7daf201d7fe8334e2d2364d4e8ed3394ec9af819 (commit) replaces v4.18-rc1 tagged by Linus Torvalds on Sun Jun 24 20:54:37 2018 +0800 - Shortlog ------------------------------------------------------------ Linux 4.18-rc2 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlsvlI0eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGueQH/jy7xefQ2i2Tpj6M 0uftRK25X+RqbuL3RYBU//IPHxGFcwEwiA8/h14pKQJJ90+OUzj/n9yJnYy24sLJ Lu78t1rY0FUSGwCzB6nXM0lUA72EVE0ugmMLIborvcZhhzYnJq0oYCGiZpSfklvV QlWUZnFoSJB+JbQ2E50J0Uj0AJsaUFh4Wd0TEZ3+nsm5DNJ3JDRskr9gObkwBDdN ViVOeXtbZaiqXl3Ncj5vTBeqgYnGjztNdpluWqNhvhyc6HG/QCHq7mn4K7qPvoBE BSiw8oQel8iIUauT+0CdNTxiCQX9Z5TfxAs6sAA91bIAcZyACsjW5KqDd9t3EDDi EO+Ph9M= =ajiq -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.18-rc1, created. v4.18-rc1
by postmaster＠open-mesh.org 17 Jun '18

17 Jun '18

The annotated tag, v4.18-rc1 has been created at 7f40f7193eaee45287374eed75ecfd5ba893f709 (tag) tagging ce397d215ccd07b8ae3f71db689aedb85d56ab40 (commit) replaces v4.17 tagged by Linus Torvalds on Sun Jun 17 08:04:58 2018 +0900 - Shortlog ------------------------------------------------------------ Linux 4.18-rc1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlsll5oeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGcuEH/2I68mKePDnTOpp4 szA8Z8rKDKJ9VJH5UzN56zreVgaVBI5dp/38qFoakUHhWYUEQui9QNkp+t0gWExn 1MNIyQKTuscTDt4oWU3gmTGf+GJrbG/u46AePAQmjJKAw0ajOg8S9SMjZOv7C1Ux fNtvXuswTi2FpVC0TncTC/l7kJA1Ik/YGdW9kzAp7FcF9fe9A/Qq8XNJWfwFv1lN LzWB3XYdF8m/QIJBC5BgwUkF9w9Ji1fgP04ccVEahIVEGhsx3RkZJHcKoBNQlJrN W1WVmEBXJgOCHSmYRIoYYTLLAezOG0WLWEb+BXe8Ylnx7lBgbIisFAhh5XADZqQD 046eASk= =UKkb -----END PGP SIGNATURE----- David S. Miller (1): Merge git://git.kernel.org/.../davem/net Linus Lüssing (1): batman-adv: Avoid old nodes disabling multicast optimizations completely Luc Van Oostenryck (1): batman-adv: fix batadv_interface_tx()'s return type Marek Lindner (2): batman-adv: disable ethtool link speed detection when auto negotiation off batman-adv: enable B.A.T.M.A.N. V compilation by default Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (3): batman-adv: Disable CONFIG_BATMAN_ADV_DEBUGFS by default batman-adv: Avoid bool in structures batman-adv: Remove unused dentry without DEBUGFS ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] maint's head updated: batman-adv: Fix multicast TT issues with bogus ROAM flags (c7054ff)
by postmaster＠open-mesh.org 12 Jun '18

12 Jun '18

Repository : ssh://git@open-mesh.org/batman-adv Branch 'maint' now includes: d7280ff batman-adv: compat: initialize sinfo in cfg80211_get_station beb6246 batman-adv: Avoid storing non-TT-sync flags on singular entries too c7054ff batman-adv: Fix multicast TT issues with bogus ROAM flags

1 0

[batman-adv] master: Merge branch 'maint' (21b78d5)
by postmaster＠open-mesh.org 12 Jun '18

12 Jun '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 21b78d57f19acf943106cee4e642c950f42443ca Merge: 1b6f5c8 c7054ff Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Jun 12 21:40:11 2018 +0200 Merge branch 'maint' >--------------------------------------------------------------- 21b78d57f19acf943106cee4e642c950f42443ca compat-include/net/cfg80211.h | 18 ++++++++++++++++++ net/batman-adv/translation-table.c | 7 +++++-- 2 files changed, 23 insertions(+), 2 deletions(-)

1 0

[batman-adv] master: batman-adv: Avoid storing non-TT-sync flags on singular entries too (beb6246)
by postmaster＠open-mesh.org 12 Jun '18

12 Jun '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit beb6246b2339852b6a429ae9259a8eb30a685041 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Thu Jun 7 00:46:23 2018 +0200 batman-adv: Avoid storing non-TT-sync flags on singular entries too Since commit 382d020fe3fa ("batman-adv: fix TT sync flag inconsistencies") TT sync flags and TT non-sync'd flags are supposed to be stored separately. The previous patch missed to apply this separation on a TT entry with only a single TT orig entry. This is a minor fix because with only a single TT orig entry the DDoS issue the former patch solves does not apply. Fixes: 382d020fe3fa ("batman-adv: fix TT sync flag inconsistencies") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- beb6246b2339852b6a429ae9259a8eb30a685041 net/batman-adv/translation-table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 3986551..61ce300 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1705,7 +1705,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, ether_addr_copy(common->addr, tt_addr); common->vid = vid; - common->flags = flags; + common->flags = flags & (~BATADV_TT_SYNC_MASK); + tt_global_entry->roam_at = 0; /* node must store current time in case of roaming. This is * needed to purge this entry out on timeout (if nobody claims

1 0

[batman-adv] master: batman-adv: Fix multicast TT issues with bogus ROAM flags (c7054ff)
by postmaster＠open-mesh.org 12 Jun '18

12 Jun '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c7054ffae0c3b08bb4bef3cffee1e0a543e14096 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Thu Jun 7 00:46:24 2018 +0200 batman-adv: Fix multicast TT issues with bogus ROAM flags When a (broken) node wrongly sends multicast TT entries with a ROAM flag then this causes any receiving node to drop all entries for the same multicast MAC address announced by other nodes, leading to packet loss. Fix this DoS vector by only storing TT sync flags. For multicast TT non-sync'ing flag bits like ROAM are unused so far anyway. Fixes: 405cc1e5a81e ("batman-adv: Modified forwarding behaviour for multicast packets") Reported-by: Leonardo Mörlein <me(a)irrelefant.net> Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- c7054ffae0c3b08bb4bef3cffee1e0a543e14096 net/batman-adv/translation-table.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 61ce300..12a2b7d 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1705,7 +1705,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, ether_addr_copy(common->addr, tt_addr); common->vid = vid; - common->flags = flags & (~BATADV_TT_SYNC_MASK); + if (!is_multicast_ether_addr(common->addr)) + common->flags = flags & (~BATADV_TT_SYNC_MASK); tt_global_entry->roam_at = 0; /* node must store current time in case of roaming. This is @@ -1769,7 +1770,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, * TT_CLIENT_TEMP, therefore they have to be copied in the * client entry */ - common->flags |= flags & (~BATADV_TT_SYNC_MASK); + if (!is_multicast_ether_addr(common->addr)) + common->flags |= flags & (~BATADV_TT_SYNC_MASK); /* If there is the BATADV_TT_CLIENT_ROAM flag set, there is only * one originator left in the list and we previously received a

1 0

[batman-adv] master: batman-adv: compat: initialize sinfo in cfg80211_get_station (d7280ff)
by postmaster＠open-mesh.org 12 Jun '18

12 Jun '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d7280ffad5e9025bc6c26f9ad4925fd0797fb8db Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 6 17:35:29 2018 +0200 batman-adv: compat: initialize sinfo in cfg80211_get_station Most of the implementations behind cfg80211_get_station will not initialize sinfo to zero before manipulating it. For example, the member "filled", which indicates the filled in parts of this struct, is often only modified by enabling certain bits in the bitfield while keeping the remaining bits in their original state. A caller without a preinitialized sinfo.filled can then no longer decide which parts of sinfo were filled in by cfg80211_get_station (or actually the underlying implementations). cfg80211_get_station must therefore take care that sinfo is initialized to zero. Otherwise, the caller may tries to read information which was not filled in and which must therefore also be considered uninitialized. In batadv_v_elp_get_throughput's case, an invalid "random" expected throughput may be stored for this neighbor and thus the B.A.T.M.A.N V algorithm may switch to non-optimal neighbors for certain destinations. batman-adv's compat layer must take care of intializing sinfo until it is fixed in the upstream kernel. Fixes: 7406353d43c8 ("cfg80211: implement cfg80211_get_station cfg80211 API") Reported-by: Thomas Lauer <holminateur(a)gmail.com> Reported-by: Marcel Schmidt <ff.z-casparistrasse(a)mailbox.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d7280ffad5e9025bc6c26f9ad4925fd0797fb8db compat-include/net/cfg80211.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h index 5003178..79c028a 100644 --- a/compat-include/net/cfg80211.h +++ b/compat-include/net/cfg80211.h @@ -43,6 +43,7 @@ static inline int cfg80211_get_station(struct net_device *dev, #endif /* < KERNEL_VERSION(3, 16, 0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) #if !IS_ENABLED(CONFIG_CFG80211) && \ @@ -61,4 +62,21 @@ static inline int batadv_cfg80211_get_station(struct net_device *dev, #endif /* < KERNEL_VERSION(4, 8, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(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 /* < KERNEL_VERSION(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) */ + #endif /* _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ */

1 0

[linux-merge]linux integration; annotated tag, v4.17, created. v4.17
by postmaster＠open-mesh.org 03 Jun '18

03 Jun '18

The annotated tag, v4.17 has been created at 42308afa917ad74c85ad01bad5ffbe04e7cc6f76 (tag) tagging 29dcea88779c856c7dc92040a0c01233263101d4 (commit) replaces v4.17-rc7 tagged by Linus Torvalds on Sun Jun 3 14:15:30 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.17 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlsUWnIeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGojkIAJi/8Z2O0ihYpvmv aVRzeCMcIY0px1Fbu5L7eCSlJ4F6IELxr6SO7ZgRdd8AIWkKH86KvTs711QGp/X2 xV2tuJlx6qHvNSPaFVM9j3ICuAyh+xR/WwI45aDUU0aH/bUwH+fI5BuHV4SCEWxn QZ6bBncFTq22P/xv9Go/67t7iWr11zo/7QfolB+Hl/XFoS8CdXgICmEFsTIypUTS +rrMSS1OGopeoLdFGPw2Z93QskTmvO6Jm8NdjGh/OIoMHTsRb8AwN+YZXJZa/Vb3 N1iRQVdHmfkRblFWjetJy/O6nfY1wYW3nVspxF1Gn1FrvNP5rDUtv3aeOvFNZsn7 eVML43M= =3tGN -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20180524, deleted. v4.17-rc1-4-g16116dac2339
by postmaster＠open-mesh.org 03 Jun '18

03 Jun '18

The annotated tag, batadv-net-for-davem-20180524 has been deleted was c995697ac84007c246c0241578723a82a71f19d4 ----------------------------------------------------------------------- tag batadv-net-for-davem-20180524 Here are some batman-adv bugfixes: - prevent hardif_put call with NULL parameter, by Colin Ian King - Avoid race in Translation Table allocator, by Sven Eckelmann - Fix Translation Table sync flags for intermediate Responses, by Linus Luessing - prevent sending inconsistent Translation Table TVLVs, by Marek Lindner -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlsGpzQWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeocg6D/420GIZ7fJf5xadOzw9XYDbU+tc nSz/N7V40BGit5i+bTo1fvQ9KRw4amUgx5nrTGi+nFmm0Au3cvwtFQe/c9JWZjFj /7LWsc/HJPjhS045qwbnwBNBrlEM0KbEwqibmKgfrwVf1uIlUueMuILOFrQtAMhE WokWK0mffxwPhwFlLxcByzqJSIUPB7BIoYnobU6orqjECdUVpUs3u4AF4Hbk28Y1 P3HS2WCK+Xgf1My7yjahh1pf1gM/AD0y+Xf+1k7dfM+n3qZrhdAPx30JmAIbcNWG T4uSarxXjio9RRV9Fy1DIggpi1oCCCGAlayTg6RwyYIv5qYB6L7dPrBlRx+gOtox QpLWIczvdMvloYFV5QykviErZRutFVBF2LKOEOI0GAGU/mCal2GNd+K1V504z+Gq PM/5SmuAPOmCXe1rf/72zpkFSspZ2h4xvPjYpdNRyBRg/QWHqz+JWMGeENtKoRYV v+3wYJTEa1bdeoc5NH7Fnc2iudeNlmISDuMxon1ikkgh5jHbaaC8Jvc6inp8y/JW hhvYd6A406H/N6WOn0FbbSuZc1DQFO/92Fib4N2zdOwBFY2adLTpjAayv/ePpMji SnGUdxoinWOUWpQo4S4SX4PXdE6F6ylNU4/Z2k9ixyQxNWO3T9wbKPaQGfLl8iSn P9wPkGr84R2tlXi21Q== =KY0V -----END PGP SIGNATURE----- 16116dac23396e73c01eeee97b102e4833a4b205 batman-adv: prevent TT request storms by not sending inconsistent TT TLVLs ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2018