linux-merge August 2019

linux-merge@lists.open-mesh.org

3 participants
59 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20190809
by batman＠open-mesh.org 09 Aug '19

09 Aug '19

The following commit has been merged in the master branch: commit f7af86ccf1882084293b11077deec049fd01da63 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jul 7 23:04:57 2019 +0200 batman-adv: Fix deletion of RTR(4|6) mcast list entries The multicast code uses the lists bat_priv->mcast.want_all_rtr*_list to store all all originator nodes which don't have the flag no-RTR4 or no-RTR6 set. When an originator is purged, it has to be removed from these lists. Since all entries without the BATADV_MCAST_WANT_NO_RTR4/6 are stored in these lists, they have to be handled like entries which have these flags set to force the update routines to remove them from the lists when purging the originator. Not doing so will leave a pointer to a freed memory region inside the list. Trying to operate on these lists will then cause an use-after-free error: BUG: KASAN: use-after-free in batadv_mcast_want_rtr4_update+0x335/0x3a0 [batman_adv] Write of size 8 at addr ffff888007b41a38 by task swapper/0/0 Fixes: 61caf3d109f5 ("batman-adv: mcast: detect, distribute and maintain multicast router presence") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index a3488cfb3d1e..1d5bdf3a4b65 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -2420,8 +2420,10 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS); batadv_mcast_want_ipv4_update(bat_priv, orig, BATADV_NO_FLAGS); batadv_mcast_want_ipv6_update(bat_priv, orig, BATADV_NO_FLAGS); - batadv_mcast_want_rtr4_update(bat_priv, orig, BATADV_NO_FLAGS); - batadv_mcast_want_rtr6_update(bat_priv, orig, BATADV_NO_FLAGS); + batadv_mcast_want_rtr4_update(bat_priv, orig, + BATADV_MCAST_WANT_NO_RTR4); + batadv_mcast_want_rtr6_update(bat_priv, orig, + BATADV_MCAST_WANT_NO_RTR6); spin_unlock_bh(&orig->mcast_handler_lock); } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20190809
by batman＠open-mesh.org 09 Aug '19

09 Aug '19

The following commit has been merged in the master branch: commit 9cb9a17813bf0de1f8ad6deb9538296d5148b5a8 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Aug 4 20:54:54 2019 +0200 batman-adv: BATMAN_V: aggregate OGMv2 packets Instead of transmitting individual OGMv2 packets from the aggregation queue merge those OGMv2 packets into a single one and transmit this aggregate instead. This reduces overhead as it saves an ethernet header and a transmission per aggregated OGMv2 packet. 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/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 52c990b54de5..319249f0f85f 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -191,18 +191,44 @@ static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface) * batadv_v_ogm_aggr_send() - flush & send aggregation queue * @hard_iface: the interface with the aggregation queue to flush * + * Aggregates all OGMv2 packets currently in the aggregation queue into a + * single OGMv2 packet and transmits this aggregate. + * + * The aggregation queue is empty after this call. + * * Caller needs to hold the hard_iface->bat_v.aggr_list_lock. */ static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface) { + unsigned int aggr_len = hard_iface->bat_v.aggr_len; + struct sk_buff *skb_aggr; + unsigned int ogm_len; struct sk_buff *skb; lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); + if (!aggr_len) + return; + + skb_aggr = dev_alloc_skb(aggr_len + ETH_HLEN + NET_IP_ALIGN); + if (!skb_aggr) { + batadv_v_ogm_aggr_list_free(hard_iface); + return; + } + + skb_reserve(skb_aggr, ETH_HLEN + NET_IP_ALIGN); + skb_reset_network_header(skb_aggr); + while ((skb = skb_dequeue(&hard_iface->bat_v.aggr_list))) { hard_iface->bat_v.aggr_len -= batadv_v_ogm_len(skb); - batadv_v_ogm_send_to_if(skb, hard_iface); + + ogm_len = batadv_v_ogm_len(skb); + skb_put_data(skb_aggr, skb->data, ogm_len); + + consume_skb(skb); } + + batadv_v_ogm_send_to_if(skb_aggr, hard_iface); } /** -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20190809
by batman＠open-mesh.org 09 Aug '19

09 Aug '19

The following commit has been merged in the master branch: commit fa3a03da549a889fc9dbc0d3c5908eb7882cac8f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jul 7 22:15:13 2019 +0200 batman-adv: Fix netlink dumping of all mcast_flags buckets The bucket variable is only updated outside the loop over the mcast_flags buckets. It will only be updated during a dumping run when the dumping has to be interrupted and a new message has to be started. This could result in repeated or missing entries when the multicast flags are dumped to userspace. Fixes: d2d489b7d851 ("batman-adv: Add inconsistent multicast netlink dump detection") 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 67d7f83009ae..a3488cfb3d1e 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -2303,7 +2303,7 @@ __batadv_mcast_flags_dump(struct sk_buff *msg, u32 portid, while (bucket_tmp < hash->size) { if (batadv_mcast_flags_dump_bucket(msg, portid, cb, hash, - *bucket, &idx_tmp)) + bucket_tmp, &idx_tmp)) break; bucket_tmp++; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20190809
by batman＠open-mesh.org 09 Aug '19

09 Aug '19

The following commit has been merged in the master branch: commit 529a8f939a5fdbfa27d10bba728d9764212ab26f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jul 6 14:56:13 2019 +0200 batman-adv: Replace usage of strlcpy with strscpy The strscpy was introduced to fix some API problems around strlcpy. And checkpatch started to report recently that strlcpy is deprecated and strscpy is preferred. The functionality introduced in commit 30035e45753b ("string: provide strscpy()") improves following points compared to strlcpy: * it doesn't read from memory beyond (src + size) * provides an easy way to check for destination buffer overflow * robust against asynchronous source buffer changes Since batman-adv doesn't depend on any of the previously mentioned behavior changes, the usage of strlcpy can simply be replaced by strscpy to silence checkpatch. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index c7a2e77ca1da..a1146cb10919 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -943,10 +943,10 @@ static const struct net_device_ops batadv_netdev_ops = { static void batadv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver)); - strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version)); - strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); - strlcpy(info->bus_info, "batman", sizeof(info->bus_info)); + strscpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver)); + strscpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version)); + strscpy(info->fw_version, "N/A", sizeof(info->fw_version)); + strscpy(info->bus_info, "batman", sizeof(info->bus_info)); } /* Inspired by drivers/net/ethernet/dlink/sundance.c:1702 diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 1efcb97039cd..e5bbc28ed12c 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1070,7 +1070,7 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj, dev_hold(net_dev); INIT_WORK(&store_work->work, batadv_store_mesh_iface_work); store_work->net_dev = net_dev; - strlcpy(store_work->soft_iface_name, buff, + strscpy(store_work->soft_iface_name, buff, sizeof(store_work->soft_iface_name)); queue_work(batadv_event_workqueue, &store_work->work); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20190809
by batman＠open-mesh.org 09 Aug '19

09 Aug '19

The following commit has been merged in the master branch: commit bc986391c80decf6b5a16756f29400377833b1e9 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sat Jul 6 15:07:50 2019 +0200 batman-adv: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 3d4c04d87ff3..6967f2e4c3f4 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 "2019.3" +#define BATADV_SOURCE_VERSION "2019.4" #endif /* B.A.T.M.A.N. parameters */ -- LinuxNextTracking

1 0

Build check errors found: 2019-08-09
by postmaster＠open-mesh.org 09 Aug '19

09 Aug '19

Name of failed tests ==================== master ------ * difference between net-next and batadv master Output of different failed tests ================================ master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/multicast.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 49 Tested Linux versions: 28 Tested configs: 48 maint ----- Failed tests: 0 Started build tests: 51 Tested Linux versions: 25 Tested configs: 49

1 0

Build check errors found: 2019-08-08
by postmaster＠open-mesh.org 08 Aug '19

08 Aug '19

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * difference between net-next and batadv master Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/multicast.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v.c | 7 netnext/net/batman-adv/bat_v_ogm.c | 179 ----------------------- netnext/net/batman-adv/bat_v_ogm.h | 3 netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 8 - netnext/net/batman-adv/soft-interface.c | 8 - netnext/net/batman-adv/sysfs.c | 2 netnext/net/batman-adv/types.h | 12 - 8 files changed, 11 insertions(+), 210 deletions(-) Statistics ========== maint ----- Failed tests: 1 Started build tests: 50 Tested Linux versions: 29 Tested configs: 50 master ------ Failed tests: 1 Started build tests: 49 Tested Linux versions: 27 Tested configs: 46

1 0

Build check errors found: 2019-08-07
by postmaster＠open-mesh.org 07 Aug '19

07 Aug '19

Name of failed tests ==================== maint ----- * difference between net and batadv maint master ------ * difference between net-next and batadv master Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/multicast.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v.c | 7 netnext/net/batman-adv/bat_v_ogm.c | 179 ----------------------- netnext/net/batman-adv/bat_v_ogm.h | 3 netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 8 - netnext/net/batman-adv/soft-interface.c | 8 - netnext/net/batman-adv/sysfs.c | 2 netnext/net/batman-adv/types.h | 12 - 8 files changed, 11 insertions(+), 210 deletions(-) Statistics ========== maint ----- Failed tests: 1 Started build tests: 49 Tested Linux versions: 27 Tested configs: 49 master ------ Failed tests: 1 Started build tests: 48 Tested Linux versions: 29 Tested configs: 48

1 0

Build check errors found: 2019-08-06
by postmaster＠open-mesh.org 06 Aug '19

06 Aug '19

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/multicast.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_v.c | 7 netnext/net/batman-adv/bat_v_ogm.c | 179 ----------------------- netnext/net/batman-adv/bat_v_ogm.h | 3 netnext/net/batman-adv/main.h | 2 netnext/net/batman-adv/multicast.c | 8 - netnext/net/batman-adv/soft-interface.c | 8 - netnext/net/batman-adv/sysfs.c | 2 netnext/net/batman-adv/types.h | 12 - 8 files changed, 11 insertions(+), 210 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 48 Tested Linux versions: 28 Tested configs: 47 maint ----- Failed tests: 1 Started build tests: 51 Tested Linux versions: 27 Tested configs: 51

1 0

Build check errors found: 2019-08-05
by postmaster＠open-mesh.org 05 Aug '19

05 Aug '19

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/multicast.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/main.h | 2 +- netnext/net/batman-adv/multicast.c | 8 +++----- netnext/net/batman-adv/soft-interface.c | 8 ++++---- netnext/net/batman-adv/sysfs.c | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 51 Tested Linux versions: 24 Tested configs: 47 maint ----- Failed tests: 1 Started build tests: 49 Tested Linux versions: 27 Tested configs: 47

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge August 2019