commits

commits@lists.open-mesh.org

1 participants
12421 discussions

[batman-adv] master: Merge branch 'maint' (b2eab52)
by postmaster＠open-mesh.org 05 Sep '18

05 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit b2eab521243265eb00877524ee41344c002223b0 Merge: 89dcbd5 848be98 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Sep 5 18:01:28 2018 +0200 Merge branch 'maint' >--------------------------------------------------------------- b2eab521243265eb00877524ee41344c002223b0 net/batman-adv/bat_v_elp.c | 2 +- net/batman-adv/sysfs.c | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'maint' (b2eab52)
by postmaster＠open-mesh.org 05 Sep '18

05 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 6c876e5 batman-adv: Avoid probe ELP information leak ddf99b7 batman-adv: Fix segfault when writing to throughput_override 848be98 batman-adv: Fix segfault when writing to sysfs elp_interval b2eab52 Merge branch 'maint'

1 0

[batman-adv] maint: batman-adv: Fix segfault when writing to throughput_override (ddf99b7)
by postmaster＠open-mesh.org 05 Sep '18

05 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit ddf99b78e255530cbadc0f67656a549e19520280 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Aug 31 16:46:47 2018 +0200 batman-adv: Fix segfault when writing to throughput_override The per hardif sysfs file "batman_adv/throughput_override" prints the resulting change as info text when the users writes to this file. It uses the helper function batadv_info to add it at the same time to the kernel ring buffer and to the batman-adv debug log (when CONFIG_BATMAN_ADV_DEBUG is enabled). The function batadv_info requires as first parameter the batman-adv softif net_device. This parameter is then used to find the private buffer which contains the debug log for this batman-adv interface. But batadv_store_throughput_override used as first argument the slave net_device. This slave device doesn't have the batadv_priv private data which is access by batadv_info. Writing to this file with CONFIG_BATMAN_ADV_DEBUG enabled can either lead to a segfault or to memory corruption. Fixes: c513176e4b7a ("batman-adv: add throughput override attribute to hard_ifaces") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ddf99b78e255530cbadc0f67656a549e19520280 net/batman-adv/sysfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index f2eef43..3a76e89 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -1090,8 +1090,9 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj, if (old_tp_override == tp_override) goto out; - batadv_info(net_dev, "%s: Changing from: %u.%u MBit to: %u.%u MBit\n", - "throughput_override", + batadv_info(hard_iface->soft_iface, + "%s: %s: Changing from: %u.%u MBit to: %u.%u MBit\n", + "throughput_override", net_dev->name, old_tp_override / 10, old_tp_override % 10, tp_override / 10, tp_override % 10);

1 0

[batman-adv] maint: batman-adv: Fix segfault when writing to sysfs elp_interval (848be98)
by postmaster＠open-mesh.org 05 Sep '18

05 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 848be9859b0109a6e428f92f21f2e660153b1c75 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Aug 31 16:56:29 2018 +0200 batman-adv: Fix segfault when writing to sysfs elp_interval The per hardif sysfs file "batman_adv/elp_interval" is using the generic functions to store/show uint values. The helper __batadv_store_uint_attr requires the softif net_device as parameter to print the resulting change as info text when the users writes to this file. It uses the helper function batadv_info to add it at the same time to the kernel ring buffer and to the batman-adv debug log (when CONFIG_BATMAN_ADV_DEBUG is enabled). The function batadv_info requires as first parameter the batman-adv softif net_device. This parameter is then used to find the private buffer which contains the debug log for this batman-adv interface. But batadv_store_throughput_override used as first argument the slave net_device. This slave device doesn't have the batadv_priv private data which is access by batadv_info. Writing to this file with CONFIG_BATMAN_ADV_DEBUG enabled can either lead to a segfault or to memory corruption. Fixes: ec46535b8275 ("batman-adv: Add hard_iface specific sysfs wrapper macros for UINT") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 848be9859b0109a6e428f92f21f2e660153b1c75 net/batman-adv/sysfs.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 3a76e89..09427fc 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -188,7 +188,8 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ \ return __batadv_store_uint_attr(buff, count, _min, _max, \ _post_func, attr, \ - &bat_priv->_var, net_dev); \ + &bat_priv->_var, net_dev, \ + NULL); \ } #define BATADV_ATTR_SIF_SHOW_UINT(_name, _var) \ @@ -262,7 +263,9 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ \ length = __batadv_store_uint_attr(buff, count, _min, _max, \ _post_func, attr, \ - &hard_iface->_var, net_dev); \ + &hard_iface->_var, \ + hard_iface->soft_iface, \ + net_dev); \ \ batadv_hardif_put(hard_iface); \ return length; \ @@ -356,10 +359,12 @@ __batadv_store_bool_attr(char *buff, size_t count, static int batadv_store_uint_attr(const char *buff, size_t count, struct net_device *net_dev, + struct net_device *slave_dev, const char *attr_name, unsigned int min, unsigned int max, atomic_t *attr) { + char ifname[IFNAMSIZ + 3] = ""; unsigned long uint_val; int ret; @@ -385,8 +390,11 @@ static int batadv_store_uint_attr(const char *buff, size_t count, if (atomic_read(attr) == uint_val) return count; - batadv_info(net_dev, "%s: Changing from: %i to: %lu\n", - attr_name, atomic_read(attr), uint_val); + if (slave_dev) + snprintf(ifname, sizeof(ifname), "%s: ", slave_dev->name); + + batadv_info(net_dev, "%s: %sChanging from: %i to: %lu\n", + attr_name, ifname, atomic_read(attr), uint_val); atomic_set(attr, uint_val); return count; @@ -397,12 +405,13 @@ static ssize_t __batadv_store_uint_attr(const char *buff, size_t count, void (*post_func)(struct net_device *), const struct attribute *attr, atomic_t *attr_store, - struct net_device *net_dev) + struct net_device *net_dev, + struct net_device *slave_dev) { int ret; - ret = batadv_store_uint_attr(buff, count, net_dev, attr->name, min, max, - attr_store); + ret = batadv_store_uint_attr(buff, count, net_dev, slave_dev, + attr->name, min, max, attr_store); if (post_func && ret) post_func(net_dev); @@ -571,7 +580,7 @@ static ssize_t batadv_store_gw_sel_class(struct kobject *kobj, return __batadv_store_uint_attr(buff, count, 1, BATADV_TQ_MAX_VALUE, batadv_post_gw_reselect, attr, &bat_priv->gw.sel_class, - bat_priv->soft_iface); + bat_priv->soft_iface, NULL); } static ssize_t batadv_show_gw_bwidth(struct kobject *kobj,

1 0

[batman-adv] maint: batman-adv: Avoid probe ELP information leak (6c876e5)
by postmaster＠open-mesh.org 05 Sep '18

05 Sep '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 6c876e572f592c31132a55b5fb8427e168e5fb3c Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Aug 31 15:08:44 2018 +0200 batman-adv: Avoid probe ELP information leak The probe ELPs for WiFi interfaces are expanded to contain at least BATADV_ELP_MIN_PROBE_SIZE bytes. This is usually a lot more than the number of bytes which the template ELP packet requires. These extra padding bytes were not initialized and thus could contain data which were previously stored at the same location. It is therefore required to set it to some predefined or random values to avoid leaking private information from the system transmitting these kind of packets. Fixes: bedcadfaa92b ("batman-adv: ELP - send unicast ELP packets for throughput sampling") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <a(a)unstable.cc> >--------------------------------------------------------------- 6c876e572f592c31132a55b5fb8427e168e5fb3c net/batman-adv/bat_v_elp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 71c20c1..e103c75 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -241,7 +241,7 @@ batadv_v_elp_wifi_neigh_probe(struct batadv_hardif_neigh_node *neigh) * the packet to be exactly of that size to make the link * throughput estimation effective. */ - skb_put(skb, probe_len - hard_iface->bat_v.elp_skb->len); + skb_put_zero(skb, probe_len - hard_iface->bat_v.elp_skb->len); batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Sending unicast (probe) ELP packet on interface %s to %pM\n",

1 0

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

02 Sep '18

The annotated tag, v4.19-rc2 has been created at f703a4f77147a05a73d889992bd6b02a152d84d6 (tag) tagging 57361846b52bc686112da6ca5368d11210796804 (commit) replaces v4.19-rc1 tagged by Linus Torvalds on Sun Sep 2 14:37:39 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.19-rc2 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAluMWCMeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGZjoH+wbEQcuzTDQGRkFG zP8VTf4tWkRc9cBAaoWfcO7vvnpFshUj4Ebdk2Nhd4NXELXQmuJBTva25tN92wzu B4cUSnTWaSkGnJHLS0V+Z1zTCPXlUgmi0mcg+dQkoHiMPTb/HVaFocHObhQdvGpx 3mJisvm/MvsrT8HX92BhSe6N6rqJ4kVdRxd5TQtVTrrJtKjbWIfkfQoNiJPeapTV 14J+c6sGyVlUUnOQ5NcV/MBxvChn+AoyB0mp22L7t1IPVwv6Spz7ZPAzzyQ/WUB/ qAAvClc3cifE8KdQj4MkxThnAfuC3Q5Ifu2+EtXmBRPFFnj/nO4gJDkADj6WRxKT 7SJE5RI= =P+RK -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

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

26 Aug '18

The annotated tag, v4.19-rc1 has been created at 0eaf7a1a2dcfb1d287af95e4a5d4fb7d7be94cbf (tag) tagging 5b394b2ddf0347bef56e50c69a58773c94343ff3 (commit) replaces v4.18 tagged by Linus Torvalds on Sun Aug 26 14:12:14 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.19-rc1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAluDF64eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGoX0H/3Vc+MxU4CdAr8s6 HhAHALmNwgvmYraEzsjGCSqtMXX0H7ni3XonWjm66WMigQi9ypESJgTFGryLECO3 csLk+BSVWF/L0zliA+orsywMkTRiwwbLsU0gC1Af/pIs3HwuydPAUVuk2cU4eaoh sVXpiKopA4FifUuar8mMNhvMbggOYMZ3fdMqhGXTQBcsCPgX6DRB8I9wAN1ONfLU bx5ZPrcn4NqQrqHjnG1YVBg5ZRBnTG7UxmBBWRwwSJnqsHs9bmCAq1dTpdxS4HYF yw1XelQ9K/u2+JyYoch1fxE8hk8Kj7xB+2BcJImoV0Fms5llDZssBlLgeusQWSU0 MJQivyk= =XPLb -----END PGP SIGNATURE----- Antonio Quartulli (1): batman-adv: enable DAT by default at compile time David S. Miller (2): Merge tag 'batadv-next-for-davem-20180717' of git://git.open-mesh.org/linux-merge Merge ra.kernel.org:/.../torvalds/linux Joe Perches (1): net: drivers/net: Convert random_ether_addr to eth_random_addr Sven Eckelmann (6): batman-adv: Drop "experimental" from BATMAN_V Kconfig batman-adv: Remove "default n" in Kconfig batman-adv: fix checkpatch warning about misspelled "cache" batman-adv: Unify include guards style batman-adv: Join batadv_purge_orig_ref and _batadv_purge_orig batman-adv: Convert batadv_dat_addr_t to proper type ----------------------------------------------------------------------- -- linux integration

1 0

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

12 Aug '18

The annotated tag, v4.18 has been created at 85262cb1fbc5cc267b3c86bc162a02dedd219548 (tag) tagging 94710cac0ef4ee177a63b5227664b38c95bbf703 (commit) replaces v4.18-rc8 tagged by Linus Torvalds on Sun Aug 12 13:41:12 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.18 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAltwm2geHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGITkH/iSzkVhT2OxHoir0 mLVzTi7/Z17L0e/ELl7TvAC0iLFlWZKdlGR0g3b4/QpXLPmNK4HxiDRTQuWn8ke0 qDZyDq89HqLt+mpeFZ43PCd9oqV8CH2xxK3iCWReqv6bNnowGnRpSStlks4rDqWn zURC/5sUh7TzEG4s997RrrpnyPeQWUlf/Mhtzg2/WvK2btoLWgu5qzjX1uFh3s7u vaF2NXVJ3X03gPktyxZzwtO1SwLFS1jhwUXWBZ5AnoJ99ywkghQnkqS/2YpekNTm wFk80/78sU+d91aAqO8kkhHj8VRrd+9SGnZ4mB2aZHwjZjGcics4RRtxukSfOQ+6 L47IdXo= =sJkt -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.18-rc8, created. v4.18-rc8
by postmaster＠open-mesh.org 05 Aug '18

05 Aug '18

The annotated tag, v4.18-rc8 has been created at 9331534f9b0bc629c3e77677439636736447cf84 (tag) tagging 1ffaddd029c867d134a1dde39f540dcc8c52e274 (commit) replaces v4.18-rc7 tagged by Linus Torvalds on Sun Aug 5 12:37:48 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.18-rc8 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAltnUgweHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGJSYH/A8ojw4ZtlBd3ZwD H+ON9WHQFoZ8qFTyEFFprQCDTrAYaxI5Hmy2XiSj03V4Fm2yWMyJWany9rdJb1dc m99YUjBKbwAvzLVmsp0deQDkozWzPR5+z5+QSFwfkRQBOw86sHZ4RQvgBLzRIWqP He+FfHCJOjPTVr0rtCrY0ypttIzp4gxAeZ6LbGQjjXUX8pRwb5OimHOkQfOtDP7T iOcvMMGgzV8liWLpw52B0D/4lb1xuWBnocIHKxICnMCnYYjaTAYrsM3hBpOL/EJ7 h9pSOsfQAl6VuQkqx8QzhpvmmiMf94/z/w827i0hLvwQ/LB3hTGQE4TQ1rxoV0Rf hwA+HrI= =LKwr -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.18-rc7, created. v4.18-rc7
by postmaster＠open-mesh.org 29 Jul '18

29 Jul '18

The annotated tag, v4.18-rc7 has been created at 71257c9661c8053cc071fcd7eb2d14549161509c (tag) tagging acb1872577b346bd15ab3a3f8dff780d6cca4b70 (commit) replaces v4.18-rc6 tagged by Linus Torvalds on Sun Jul 29 14:44:58 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.18-rc7 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlteNVoeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGV4YH/ju0Ya0M9jWX8nFj 2QzrwKKHPeF6b0hJpKeqs9TFXGZXrYeUleNnU5MIBTfJKRUiO8wThkr3ip/FUFzv z/ewbA1KaJwh3vRpnF7GfE2Cxk/eduxSckYZRpzxQ1E5BQSGbqoOyT/I83DP9paE tdD05Y+1iOnMD86J15jvFp/rjFabq/tkbLBrpecjCpWtusnTbDu51yze2QmkDo1z DhQ5wcqSPa9CIhrvuO7zrSwnEuh4GLdCZ1+5edlR7bJXDtBSYs8COS2zhs+7Pv+1 zjYiNbfdfGzS6psnkLNkIJRdcQrJM8lqzU8ZgaDixLZXl1XySEcNs+lUUaBX4bu0 jB/iLIw= =v6k/ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits