From b2e7b1a301a656c318596aabf1f94957c60a8463 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 26 Dec 2017 12:05:17 +0100 Subject: [PATCH 1/2] batctl: Merge bugfixes from v2017.4 * Handle allocation error in vlan_get_link_parse * Simplify concatenation of pathnames * tcpdump: Fix types for for TT v1 * Free nl_sock when if_nametoindex failed * Free nl_sock on genl_ctrl_resolve error * Handle nl_cb_alloc errors * Handle nl_socket_alloc errors * Handle nlmsg_alloc errors * Handle allocation error for path_buff * Handle failure during hash_iterator allocation * Print dummy value when localtime failed * suppress implicit-fallthrough compiler warning * change PATH_BUFF_LEN to maximal possible value Signed-off-by: Sven Eckelmann --- batctl/Makefile | 2 +- ...TH_BUFF_LEN-to-maximal-possible-valu.patch | 47 ++++++++++++ ...implicit-fallthrough-compiler-warnin.patch | 43 +++++++++++ ...nt-dummy-value-when-localtime-failed.patch | 33 +++++++++ ...ilure-during-hash_iterator-allocatio.patch | 29 ++++++++ ...andle-allocation-error-for-path_buff.patch | 56 +++++++++++++++ ...006-batctl-Handle-nlmsg_alloc-errors.patch | 63 ++++++++++++++++ ...batctl-Handle-nl_socket_alloc-errors.patch | 50 +++++++++++++ ...008-batctl-Handle-nl_cb_alloc-errors.patch | 72 +++++++++++++++++++ ...e-nl_sock-on-genl_ctrl_resolve-error.patch | 59 +++++++++++++++ ...e-nl_sock-when-if_nametoindex-failed.patch | 40 +++++++++++ ...tctl-tcpdump-Fix-types-for-for-TT-v1.patch | 30 ++++++++ ...-Simplify-concatenation-of-pathnames.patch | 58 +++++++++++++++ ...location-error-in-vlan_get_link_pars.patch | 31 ++++++++ 14 files changed, 612 insertions(+), 1 deletion(-) create mode 100644 batctl/patches/0001-batctl-change-PATH_BUFF_LEN-to-maximal-possible-valu.patch create mode 100644 batctl/patches/0002-batctl-suppress-implicit-fallthrough-compiler-warnin.patch create mode 100644 batctl/patches/0003-batctl-Print-dummy-value-when-localtime-failed.patch create mode 100644 batctl/patches/0004-batctl-Handle-failure-during-hash_iterator-allocatio.patch create mode 100644 batctl/patches/0005-batctl-Handle-allocation-error-for-path_buff.patch create mode 100644 batctl/patches/0006-batctl-Handle-nlmsg_alloc-errors.patch create mode 100644 batctl/patches/0007-batctl-Handle-nl_socket_alloc-errors.patch create mode 100644 batctl/patches/0008-batctl-Handle-nl_cb_alloc-errors.patch create mode 100644 batctl/patches/0009-batctl-Free-nl_sock-on-genl_ctrl_resolve-error.patch create mode 100644 batctl/patches/0010-batctl-Free-nl_sock-when-if_nametoindex-failed.patch create mode 100644 batctl/patches/0011-batctl-tcpdump-Fix-types-for-for-TT-v1.patch create mode 100644 batctl/patches/0012-batctl-Simplify-concatenation-of-pathnames.patch create mode 100644 batctl/patches/0013-batctl-Handle-allocation-error-in-vlan_get_link_pars.patch diff --git a/batctl/Makefile b/batctl/Makefile index 60c3dd9..75c4117 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl PKG_VERSION:=2016.5 -PKG_RELEASE:=0 +PKG_RELEASE:=1 PKG_MD5SUM:=7b33fb47c7fa5b317e9a152a286999fc PKG_HASH:=07edeb1d87a548285be8c499542790a158fc8d94ef7ebb295f27ebf710024ae9 diff --git a/batctl/patches/0001-batctl-change-PATH_BUFF_LEN-to-maximal-possible-valu.patch b/batctl/patches/0001-batctl-change-PATH_BUFF_LEN-to-maximal-possible-valu.patch new file mode 100644 index 0000000..931d14a --- /dev/null +++ b/batctl/patches/0001-batctl-change-PATH_BUFF_LEN-to-maximal-possible-valu.patch @@ -0,0 +1,47 @@ +From: Philipp Psurek +Date: Tue, 13 Jun 2017 10:25:59 +0200 +Subject: [PATCH] batctl: change PATH_BUFF_LEN to maximal possible value + +The output of + +snprintf(path_buff, PATH_BUFF_LEN, SYS_ROUTING_ALGO_FMT, iface_dir->d_name) + +in sys.c can be between 34 and 289 bytes and should not write into a +destination of size 200. + +Signed-off-by: Philipp Psurek +[sw: use higher limits to be future-proof] +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/620226bf8cff30e6dd966c8fe922b2d4cddf843b +--- + functions.c | 2 +- + functions.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/functions.c b/functions.c +index abd588209337dcfa04be9aadbf4ba39bb46771bb..676012bb56f9f8aa757b4805e27d904181ee2d27 100644 +--- a/functions.c ++++ b/functions.c +@@ -59,7 +59,7 @@ + #include "debugfs.h" + #include "netlink.h" + +-#define PATH_BUFF_LEN 200 ++#define PATH_BUFF_LEN 400 + + static struct timespec start_time; + static char *host_name; +diff --git a/functions.h b/functions.h +index 95cd6cf32b0c97cc36f7a81a7d8b126a0bbc389b..99e9085b4f392452d0e0b711dac334559408c1fb 100644 +--- a/functions.h ++++ b/functions.h +@@ -31,7 +31,7 @@ + #define ETH_STR_LEN 17 + #define BATMAN_ADV_TAG "batman-adv:" + +-#define PATH_BUFF_LEN 200 ++#define PATH_BUFF_LEN 400 + + /* return time delta from start to end in milliseconds */ + void start_timer(void); diff --git a/batctl/patches/0002-batctl-suppress-implicit-fallthrough-compiler-warnin.patch b/batctl/patches/0002-batctl-suppress-implicit-fallthrough-compiler-warnin.patch new file mode 100644 index 0000000..0c3f7f9 --- /dev/null +++ b/batctl/patches/0002-batctl-suppress-implicit-fallthrough-compiler-warnin.patch @@ -0,0 +1,43 @@ +From: Philipp Psurek +Date: Tue, 13 Jun 2017 13:08:24 +0200 +Subject: [PATCH] batctl: suppress implicit-fallthrough compiler warning + +GCC 7.1.0 complains about an intended fallthrough. +“__attribute__ ((fallthrough))” in this part of code would suppress this +warning. Because older GCC compiler don’t understand this statement attribute +and because there is already a comment in the source containing +“falls?[ \t-]*thr(ough|u)” we can suppress the warning with the +“-Wimplicit-fallthrough=2” warning option. Unintended fallthroughs without a +comment would trigger this warning again. + +To avoid compiler recognition in the Makefile a simply change of the comment +is sufficient to suppress the warning. For some reason only stand alone +comments mentioned in [1] are recognized so the comment has to be split up into +two parts. + +[1] https://gcc.gnu.org/onlinedocs/gcc-7.1.0/gcc/Warning-Options.html#index-Wimplicit-fallthrough_003d + +Signed-off-by: Philipp Psurek +[sw: Put the second comment part into a new line to avoid clutter] +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/50ee3c45feeda6d8c04ee127097badf99f78a26e +--- + tp_meter.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tp_meter.c b/tp_meter.c +index f95b8391ff3426200697034f1087274ca9e5a9dd..ec0dc4802c638471ff3c38bd344e31c208b634a5 100644 +--- a/tp_meter.c ++++ b/tp_meter.c +@@ -498,8 +498,9 @@ int tp_meter(char *mesh_iface, int argc, char **argv) + break; + case BATADV_TP_REASON_CANCEL: + printf("CANCEL received: test aborted\n"); +- /* fall through and print the partial result */ ++ /* fall through */ + case BATADV_TP_REASON_COMPLETE: ++ /* print the partial result */ + if (result.test_time > 0) { + throughput = result.total_bytes * 1000; + throughput /= result.test_time; diff --git a/batctl/patches/0003-batctl-Print-dummy-value-when-localtime-failed.patch b/batctl/patches/0003-batctl-Print-dummy-value-when-localtime-failed.patch new file mode 100644 index 0000000..a29b740 --- /dev/null +++ b/batctl/patches/0003-batctl-Print-dummy-value-when-localtime-failed.patch @@ -0,0 +1,33 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:35 +0100 +Subject: [PATCH] batctl: Print dummy value when localtime failed + +localtime can return NULL when the local time could not be calculated. +Accessing this NULL pointer is not allowed. + +Fixes: 05f27bfcd302 ("add arp packets , change output") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/09dd2dc0b4945c83bd07ad4bce64062239d901fb +--- + tcpdump.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/tcpdump.c b/tcpdump.c +index 2125b66d0871c4a127425bfad0135a9f565cfb78..db9c46afecf3de94dbd4d9292df1fe0812fb8bfc 100644 +--- a/tcpdump.c ++++ b/tcpdump.c +@@ -103,7 +103,11 @@ static int print_time(void) + gettimeofday(&tv, NULL); + tm = localtime(&tv.tv_sec); + +- printf("%02d:%02d:%02d.%06ld ", tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec); ++ if (tm) ++ printf("%02d:%02d:%02d.%06ld ", tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec); ++ else ++ printf("00:00:00.000000 "); ++ + return 1; + } + diff --git a/batctl/patches/0004-batctl-Handle-failure-during-hash_iterator-allocatio.patch b/batctl/patches/0004-batctl-Handle-failure-during-hash_iterator-allocatio.patch new file mode 100644 index 0000000..1182cab --- /dev/null +++ b/batctl/patches/0004-batctl-Handle-failure-during-hash_iterator-allocatio.patch @@ -0,0 +1,29 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:36 +0100 +Subject: [PATCH] batctl: Handle failure during hash_iterator allocation + +The iterator functions should not try to start the iteration when the +iterator could not be allocated. + +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/aa316bf6d1b2cf0ab7189ed8620c17f5018d4d37 +--- + hash.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hash.c b/hash.c +index 08d47b5b8f812d718f9463c548d73fbffb49b1b3..c6f735c64b573928441b41936646d195bc0da4bb 100644 +--- a/hash.c ++++ b/hash.c +@@ -120,6 +120,9 @@ struct hash_it_t *hash_iterate(struct hashtable_t *hash, + + if (iter_in == NULL) { + iter = debugMalloc(sizeof(struct hash_it_t), 301); ++ if (!iter) ++ return NULL; ++ + iter->index = -1; + iter->bucket = NULL; + iter->prev_bucket = NULL; diff --git a/batctl/patches/0005-batctl-Handle-allocation-error-for-path_buff.patch b/batctl/patches/0005-batctl-Handle-allocation-error-for-path_buff.patch new file mode 100644 index 0000000..f58427b --- /dev/null +++ b/batctl/patches/0005-batctl-Handle-allocation-error-for-path_buff.patch @@ -0,0 +1,56 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:37 +0100 +Subject: [PATCH] batctl: Handle allocation error for path_buff + +Fixes: 5a1af99276b0 ("batctl: adapt batctl to new sysfs interface handling") +Fixes: 306fcb4480c9 ("batctl: support for multiple mesh clouds") +Fixes: af115c9acf44 ("batctl: support new gateway sysfs API") +Fixes: 2c2cb260ad2e ("batctl: list supported and configured routing algorithms") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/3b52283a5f60d1c6ec11628d031e72f0a28a720f +--- + sys.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/sys.c b/sys.c +index b52434072b34b949c73de8346f8c2dce615423a4..3047b5f6eebf26290f2d8c4840d52bb1bddc3e3f 100644 +--- a/sys.c ++++ b/sys.c +@@ -153,6 +153,11 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) + } + + path_buff = malloc(PATH_BUFF_LEN); ++ if (!path_buff) { ++ fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); ++ return EXIT_FAILURE; ++ } ++ + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + + if (argc != 1) { +@@ -253,6 +258,11 @@ int handle_sys_setting(char *mesh_iface, int setting, int argc, char **argv) + + /* prepare the classic path */ + path_buff = malloc(PATH_BUFF_LEN); ++ if (!path_buff) { ++ fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); ++ return EXIT_FAILURE; ++ } ++ + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + + /* if the specified interface is a VLAN then change the path to point +@@ -325,6 +335,11 @@ int handle_gw_setting(char *mesh_iface, int argc, char **argv) + } + + path_buff = malloc(PATH_BUFF_LEN); ++ if (!path_buff) { ++ fprintf(stderr, "Error - could not allocate path buffer: out of memory ?\n"); ++ return EXIT_FAILURE; ++ } ++ + snprintf(path_buff, PATH_BUFF_LEN, SYS_BATIF_PATH_FMT, mesh_iface); + + if (argc == 1) { diff --git a/batctl/patches/0006-batctl-Handle-nlmsg_alloc-errors.patch b/batctl/patches/0006-batctl-Handle-nlmsg_alloc-errors.patch new file mode 100644 index 0000000..ec43338 --- /dev/null +++ b/batctl/patches/0006-batctl-Handle-nlmsg_alloc-errors.patch @@ -0,0 +1,63 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:38 +0100 +Subject: [PATCH] batctl: Handle nlmsg_alloc errors + +nlmsg_alloc may return NULL on errors. The processing has to be aborted +when this happens. + +Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/27e9937635ffbfe33f7f3297aff911718b8deb56 +--- + netlink.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/netlink.c b/netlink.c +index 5f4325b0bb6b4a41860a75bd0851e446c5af9a88..64afeedac46bf3eab14a1d89d7db4491fbef8d81 100644 +--- a/netlink.c ++++ b/netlink.c +@@ -302,6 +302,11 @@ static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) + return NULL; + + msg = nlmsg_alloc(); ++ if (!msg) { ++ nl_socket_free(sock); ++ return NULL; ++ } ++ + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, 0, + BATADV_CMD_GET_MESH_INFO, 1); + +@@ -399,6 +404,11 @@ int netlink_print_routing_algos(void) + return -EOPNOTSUPP; + + msg = nlmsg_alloc(); ++ if (!msg) { ++ last_err = -ENOMEM; ++ goto err_free_sock; ++ } ++ + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, NLM_F_DUMP, + BATADV_CMD_GET_ROUTING_ALGOS, 1); + +@@ -415,6 +425,8 @@ int netlink_print_routing_algos(void) + nl_cb_err(cb, NL_CB_CUSTOM, print_error, NULL); + + nl_recvmsgs(sock, cb); ++ ++err_free_sock: + nl_socket_free(sock); + + if (!last_err) +@@ -1131,6 +1143,9 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, + header); + + msg = nlmsg_alloc(); ++ if (!msg) ++ continue; ++ + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, + NLM_F_DUMP, nl_cmd, 1); + diff --git a/batctl/patches/0007-batctl-Handle-nl_socket_alloc-errors.patch b/batctl/patches/0007-batctl-Handle-nl_socket_alloc-errors.patch new file mode 100644 index 0000000..0d78f7f --- /dev/null +++ b/batctl/patches/0007-batctl-Handle-nl_socket_alloc-errors.patch @@ -0,0 +1,50 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:39 +0100 +Subject: [PATCH] batctl: Handle nl_socket_alloc errors + +nl_socket_alloc may return NULL on errors. The processing has to be aborted +when this happens. + +Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/bc6cd37e0d3ce08e3b89e3123ffa87dc55f24c09 +--- + netlink.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/netlink.c b/netlink.c +index 64afeedac46bf3eab14a1d89d7db4491fbef8d81..107ca52a4866e25b7b04428d770a885ca4e826d2 100644 +--- a/netlink.c ++++ b/netlink.c +@@ -295,6 +295,9 @@ static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) + }; + + sock = nl_socket_alloc(); ++ if (!sock) ++ return NULL; ++ + genl_connect(sock); + + family = genl_ctrl_resolve(sock, BATADV_NL_NAME); +@@ -397,6 +400,9 @@ int netlink_print_routing_algos(void) + }; + + sock = nl_socket_alloc(); ++ if (!sock) ++ return -ENOMEM; ++ + genl_connect(sock); + + family = genl_ctrl_resolve(sock, BATADV_NL_NAME); +@@ -1104,6 +1110,9 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, + int family; + + sock = nl_socket_alloc(); ++ if (!sock) ++ return -ENOMEM; ++ + genl_connect(sock); + + family = genl_ctrl_resolve(sock, BATADV_NL_NAME); diff --git a/batctl/patches/0008-batctl-Handle-nl_cb_alloc-errors.patch b/batctl/patches/0008-batctl-Handle-nl_cb_alloc-errors.patch new file mode 100644 index 0000000..8998a77 --- /dev/null +++ b/batctl/patches/0008-batctl-Handle-nl_cb_alloc-errors.patch @@ -0,0 +1,72 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:40 +0100 +Subject: [PATCH] batctl: Handle nl_cb_alloc errors + +nl_cb_alloc may return NULL on errors. The processing has to be aborted +when this happens. + +Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/0a14f8800dac67d706827e9be7745e2319f5412c +--- + netlink.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/netlink.c b/netlink.c +index 107ca52a4866e25b7b04428d770a885ca4e826d2..3eb66c9de30c21722bb1e348b055838ea14d18cf 100644 +--- a/netlink.c ++++ b/netlink.c +@@ -320,11 +320,15 @@ static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) + nlmsg_free(msg); + + cb = nl_cb_alloc(NL_CB_DEFAULT); ++ if (!cb) ++ goto err_free_sock; ++ + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, info_callback, &opts); + nl_cb_err(cb, NL_CB_CUSTOM, print_error, NULL); + + nl_recvmsgs(sock, cb); + ++err_free_sock: + nl_socket_free(sock); + + return opts.remaining_header; +@@ -425,6 +429,11 @@ int netlink_print_routing_algos(void) + opts.remaining_header = strdup("Available routing algorithms:\n"); + + cb = nl_cb_alloc(NL_CB_DEFAULT); ++ if (!cb) { ++ last_err = -ENOMEM; ++ goto err_free_sock; ++ } ++ + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, netlink_print_common_cb, + &opts); + nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, stop_callback, NULL); +@@ -1134,9 +1143,14 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, + } + } + ++ cb = nl_cb_alloc(NL_CB_DEFAULT); ++ if (!cb) { ++ last_err = -ENOMEM; ++ goto err_free_sock; ++ } ++ + bat_hosts_init(read_opt); + +- cb = nl_cb_alloc(NL_CB_DEFAULT); + nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, netlink_print_common_cb, &opts); + nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, stop_callback, NULL); + nl_cb_err(cb, NL_CB_CUSTOM, print_error, NULL); +@@ -1181,6 +1195,7 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, + + bat_hosts_free(); + ++err_free_sock: + nl_socket_free(sock); + + return last_err; diff --git a/batctl/patches/0009-batctl-Free-nl_sock-on-genl_ctrl_resolve-error.patch b/batctl/patches/0009-batctl-Free-nl_sock-on-genl_ctrl_resolve-error.patch new file mode 100644 index 0000000..047d520 --- /dev/null +++ b/batctl/patches/0009-batctl-Free-nl_sock-on-genl_ctrl_resolve-error.patch @@ -0,0 +1,59 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:41 +0100 +Subject: [PATCH] batctl: Free nl_sock on genl_ctrl_resolve error + +genl_ctrl_resolve may return NULL on errors. The code must then free the +socket which was used to start the genl_ctrl_resolve and stop the function +with an error code. + +Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/cdac2f843c616caaa2a0d3847aeec84c200c62d6 +--- + netlink.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/netlink.c b/netlink.c +index 3eb66c9de30c21722bb1e348b055838ea14d18cf..ee58ce8bf16e224374940dddaff61f7b3c5aa4bb 100644 +--- a/netlink.c ++++ b/netlink.c +@@ -301,8 +301,10 @@ static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) + genl_connect(sock); + + family = genl_ctrl_resolve(sock, BATADV_NL_NAME); +- if (family < 0) ++ if (family < 0) { ++ nl_socket_free(sock); + return NULL; ++ } + + msg = nlmsg_alloc(); + if (!msg) { +@@ -410,8 +412,10 @@ int netlink_print_routing_algos(void) + genl_connect(sock); + + family = genl_ctrl_resolve(sock, BATADV_NL_NAME); +- if (family < 0) +- return -EOPNOTSUPP; ++ if (family < 0) { ++ last_err = -EOPNOTSUPP; ++ goto err_free_sock; ++ } + + msg = nlmsg_alloc(); + if (!msg) { +@@ -1125,8 +1129,10 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, + genl_connect(sock); + + family = genl_ctrl_resolve(sock, BATADV_NL_NAME); +- if (family < 0) +- return -EOPNOTSUPP; ++ if (family < 0) { ++ last_err = -EOPNOTSUPP; ++ goto err_free_sock; ++ } + + ifindex = if_nametoindex(mesh_iface); + if (!ifindex) { diff --git a/batctl/patches/0010-batctl-Free-nl_sock-when-if_nametoindex-failed.patch b/batctl/patches/0010-batctl-Free-nl_sock-when-if_nametoindex-failed.patch new file mode 100644 index 0000000..206f558 --- /dev/null +++ b/batctl/patches/0010-batctl-Free-nl_sock-when-if_nametoindex-failed.patch @@ -0,0 +1,40 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:42 +0100 +Subject: [PATCH] batctl: Free nl_sock when if_nametoindex failed + +The if_nametoindex can return an error. The code must then free the +previously allocated nl_sock and stop the function with an error code. + +Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/4361841bf76ecd27dcfca6edc30c63b05854d415 +--- + netlink.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/netlink.c b/netlink.c +index ee58ce8bf16e224374940dddaff61f7b3c5aa4bb..88a5c95c67989a812231aec7352eecfc4e38c70d 100644 +--- a/netlink.c ++++ b/netlink.c +@@ -1137,7 +1137,8 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, + ifindex = if_nametoindex(mesh_iface); + if (!ifindex) { + fprintf(stderr, "Interface %s is unknown\n", mesh_iface); +- return -ENODEV; ++ last_err = -ENODEV; ++ goto err_free_sock; + } + + if (orig_iface) { +@@ -1145,7 +1146,8 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, + if (!hardifindex) { + fprintf(stderr, "Interface %s is unknown\n", + orig_iface); +- return -ENODEV; ++ last_err = -ENODEV; ++ goto err_free_sock; + } + } + diff --git a/batctl/patches/0011-batctl-tcpdump-Fix-types-for-for-TT-v1.patch b/batctl/patches/0011-batctl-tcpdump-Fix-types-for-for-TT-v1.patch new file mode 100644 index 0000000..a4553b7 --- /dev/null +++ b/batctl/patches/0011-batctl-tcpdump-Fix-types-for-for-TT-v1.patch @@ -0,0 +1,30 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:43 +0100 +Subject: [PATCH] batctl: tcpdump: Fix types for for TT v1 + +The num_entry and num_vlan variables are accessed (printed) as u16 +variables and not like integers. They should therefore also be stored like +that. + +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/15a1335cadacc7c3bb4723a30617d123a961a311 +--- + tcpdump.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tcpdump.c b/tcpdump.c +index db9c46afecf3de94dbd4d9292df1fe0812fb8bfc..da5541ea9f5f9f9b6fd0838d2242daa22d41a28d 100644 +--- a/tcpdump.c ++++ b/tcpdump.c +@@ -157,7 +157,8 @@ static void batctl_tvlv_parse_tt_v1(void *buff, ssize_t buff_len) + { + struct batadv_tvlv_tt_data *tvlv = buff; + struct batadv_tvlv_tt_vlan_data *vlan; +- int i, num_vlan, num_entry; ++ int i; ++ unsigned short num_vlan, num_entry; + const char *type; + size_t vlan_len; + diff --git a/batctl/patches/0012-batctl-Simplify-concatenation-of-pathnames.patch b/batctl/patches/0012-batctl-Simplify-concatenation-of-pathnames.patch new file mode 100644 index 0000000..f07eb75 --- /dev/null +++ b/batctl/patches/0012-batctl-Simplify-concatenation-of-pathnames.patch @@ -0,0 +1,58 @@ +From: Sven Eckelmann +Date: Thu, 23 Nov 2017 15:04:44 +0100 +Subject: [PATCH] batctl: Simplify concatenation of pathnames + +The combination of strncpy and strncat is hard to read and it is rather +easy to introduce some kind of problems when using that. The usage of +snprintf simplifies it slightly. + +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/cfaec23c5f6f2cf649f3e0673b2e0c61bc01969f +--- + bat-hosts.c | 4 +--- + functions.c | 8 ++------ + 2 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/bat-hosts.c b/bat-hosts.c +index a4add34bbaf8c34f8357ba8d1583218fdaf4df93..66e8f05bd2277e5560be77a26b97245223fa72aa 100644 +--- a/bat-hosts.c ++++ b/bat-hosts.c +@@ -194,9 +194,7 @@ void bat_hosts_init(int read_opt) + if (!homedir) + continue; + +- strncpy(confdir, homedir, CONF_DIR_LEN); +- confdir[CONF_DIR_LEN - 1] = '\0'; +- strncat(confdir, &bat_hosts_path[i][1], CONF_DIR_LEN - strlen(confdir) - 1); ++ snprintf(confdir, CONF_DIR_LEN, "%s%s", homedir, &bat_hosts_path[i][1]); + } else { + strncpy(confdir, bat_hosts_path[i], CONF_DIR_LEN); + confdir[CONF_DIR_LEN - 1] = '\0'; +diff --git a/functions.c b/functions.c +index 676012bb56f9f8aa757b4805e27d904181ee2d27..1c96e6241d01b83a136ff135bee8dd780629f7aa 100644 +--- a/functions.c ++++ b/functions.c +@@ -208,9 +208,7 @@ int read_file(const char *dir, const char *fname, int read_opt, + if (read_opt & USE_BAT_HOSTS) + bat_hosts_init(read_opt); + +- strncpy(full_path, dir, sizeof(full_path)); +- full_path[sizeof(full_path) - 1] = '\0'; +- strncat(full_path, fname, sizeof(full_path) - strlen(full_path) - 1); ++ snprintf(full_path, sizeof(full_path), "%s%s", dir, fname); + + open: + line = 0; +@@ -349,9 +347,7 @@ int write_file(const char *dir, const char *fname, const char *arg1, + char full_path[500]; + ssize_t write_len; + +- strncpy(full_path, dir, sizeof(full_path)); +- full_path[sizeof(full_path) - 1] = '\0'; +- strncat(full_path, fname, sizeof(full_path) - strlen(full_path) - 1); ++ snprintf(full_path, sizeof(full_path), "%s%s", dir, fname); + + fd = open(full_path, O_WRONLY); + diff --git a/batctl/patches/0013-batctl-Handle-allocation-error-in-vlan_get_link_pars.patch b/batctl/patches/0013-batctl-Handle-allocation-error-in-vlan_get_link_pars.patch new file mode 100644 index 0000000..e772cae --- /dev/null +++ b/batctl/patches/0013-batctl-Handle-allocation-error-in-vlan_get_link_pars.patch @@ -0,0 +1,31 @@ +From: Sven Eckelmann +Date: Sat, 2 Dec 2017 08:45:59 +0100 +Subject: [PATCH] batctl: Handle allocation error in vlan_get_link_parse + +The malloc could fail and return NULL. In this case, the processing of the +current interface index has to be stopped to avoid writing to NULL (which +would cause a segfault). + +Fixes: d29288fe0583 ("batctl: implement vlan-to-link helper functions") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batctl.git/commit/2ea390ce9bdda39d3c15bd9470009f56f42d5ed9 +--- + functions.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/functions.c b/functions.c +index 1c96e6241d01b83a136ff135bee8dd780629f7aa..f91f26f4045766474d5dc109d76e20afd91a7791 100644 +--- a/functions.c ++++ b/functions.c +@@ -812,6 +812,9 @@ static int vlan_get_link_parse(struct nl_msg *msg, void *arg) + idx = *(int *)nla_data(tb[IFLA_LINK]); + free(nl_arg->iface); + nl_arg->iface = malloc(IFNAMSIZ + 1); ++ if (!nl_arg->iface) ++ goto err; ++ + if (!if_indextoname(idx, nl_arg->iface)) + goto err; + From 285c803c0a39d05d9a5906ba844981a10647b088 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Tue, 26 Dec 2017 13:07:40 +0100 Subject: [PATCH 2/2] batman-adv: Merge bugfixes from 2017.4 * Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq * Fix check of retrieved orig_gw in batadv_v_gw_is_eligible * Always initialize fragment header priority * Avoid spurious warnings from bat_v neigh_cmp implementation * fix TT sync flag inconsistencies * Accept only filled wifi station info * Use default throughput value on cfg80211 error * do not add loop detection mac addresses to global tt * Fix rx packet/bytes stats on local ARP reply * handle race condition for claims between gateways * fix memory leak when dropping packet from other gateway * drop unicast packets from other backbone gw * prevent duplication of ARP replies when DAT is used * prevent multiple ARP replies sent by gateways if dat enabled * Initialize gw sel_class via batadv_algo * Keep fragments equally sized * decrease maximum fragment size * don't add loop detect macs to TT * Treat NET_XMIT_CN as transmit successfully Signed-off-by: Sven Eckelmann --- batman-adv/Makefile | 2 +- ...mpat-fallback-for-batadv_getlink_net.patch | 4 +- ...ase-hardif-refcnt-on-fragmentation-s.patch | 4 +- ...ouble-free-during-fragment-merge-err.patch | 2 +- ...-transmission-of-final-16th-fragment.patch | 2 +- ...-NET_XMIT_CN-as-transmit-successfull.patch | 123 +++++++++++ ...adv-don-t-add-loop-detect-macs-to-TT.patch | 67 ++++++ ...n-adv-decrease-maximum-fragment-size.patch | 52 +++++ ...man-adv-Keep-fragments-equally-sized.patch | 90 ++++++++ ...tialize-gw-sel_class-via-batadv_algo.patch | 144 ++++++++++++ ...nt-multiple-ARP-replies-sent-by-gate.patch | 142 ++++++++++++ ...nt-duplication-of-ARP-replies-when-D.patch | 91 ++++++++ ...unicast-packets-from-other-backbone-.patch | 69 ++++++ ...emory-leak-when-dropping-packet-from.patch | 33 +++ ...e-race-condition-for-claims-between-.patch | 67 ++++++ ...x-packet-bytes-stats-on-local-ARP-re.patch | 36 +++ ...t-add-loop-detection-mac-addresses-t.patch | 35 +++ ...efault-throughput-value-on-cfg80211-.patch | 35 +++ ...Accept-only-filled-wifi-station-info.patch | 98 ++++++++ ...adv-fix-TT-sync-flag-inconsistencies.patch | 209 ++++++++++++++++++ ...-spurious-warnings-from-bat_v-neigh_.patch | 56 +++++ ...s-initialize-fragment-header-priorit.patch | 30 +++ ...heck-of-retrieved-orig_gw-in-batadv_.patch | 31 +++ ...ock-for-ogm-cnt-access-in-batadv_iv_.patch | 42 ++++ 24 files changed, 1459 insertions(+), 5 deletions(-) create mode 100644 batman-adv/patches/0005-batman-adv-Treat-NET_XMIT_CN-as-transmit-successfull.patch create mode 100644 batman-adv/patches/0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch create mode 100644 batman-adv/patches/0007-batman-adv-decrease-maximum-fragment-size.patch create mode 100644 batman-adv/patches/0008-batman-adv-Keep-fragments-equally-sized.patch create mode 100644 batman-adv/patches/0009-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch create mode 100644 batman-adv/patches/0010-batman-adv-prevent-multiple-ARP-replies-sent-by-gate.patch create mode 100644 batman-adv/patches/0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch create mode 100644 batman-adv/patches/0012-batman-adv-drop-unicast-packets-from-other-backbone-.patch create mode 100644 batman-adv/patches/0013-batman-adv-fix-memory-leak-when-dropping-packet-from.patch create mode 100644 batman-adv/patches/0014-batman-adv-handle-race-condition-for-claims-between-.patch create mode 100644 batman-adv/patches/0015-batman-adv-Fix-rx-packet-bytes-stats-on-local-ARP-re.patch create mode 100644 batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch create mode 100644 batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch create mode 100644 batman-adv/patches/0018-batman-adv-Accept-only-filled-wifi-station-info.patch create mode 100644 batman-adv/patches/0019-batman-adv-fix-TT-sync-flag-inconsistencies.patch create mode 100644 batman-adv/patches/0020-batman-adv-Avoid-spurious-warnings-from-bat_v-neigh_.patch create mode 100644 batman-adv/patches/0021-batman-adv-Always-initialize-fragment-header-priorit.patch create mode 100644 batman-adv/patches/0022-batman-adv-Fix-check-of-retrieved-orig_gw-in-batadv_.patch create mode 100644 batman-adv/patches/0023-batman-adv-Fix-lock-for-ogm-cnt-access-in-batadv_iv_.patch diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 46cd744..d7f567d 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2016.5 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_MD5SUM:=6717a933a08dd2a01b00df30cb9f16a8 PKG_HASH:=d0a0fc90c4f410b57d043215e253bb0b855efa5edbe165d87c17bfdcfafd0db7 diff --git a/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch b/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch index c641828..bda2ee6 100644 --- a/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch +++ b/batman-adv/patches/0001-Add-compat-fallback-for-batadv_getlink_net.patch @@ -1,12 +1,14 @@ From: Sven Eckelmann Date: Fri, 23 Sep 2016 14:55:38 +0200 Subject: [PATCH] Add compat fallback for batadv_getlink_net + +Forwarded: not-needed --- net/batman-adv/hard-interface.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c -index 61a431a9..6969f580 100644 +index 61a431a9772ba96418644b399c9e787cbfd0e743..6969f580d0bfd0428f1c6985eaec8bbbf5a0d38b 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -95,6 +95,9 @@ out: diff --git a/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch b/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch index 92da394..a234093 100644 --- a/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch +++ b/batman-adv/patches/0002-batman-adv-Decrease-hardif-refcnt-on-fragmentation-s.patch @@ -8,12 +8,14 @@ after that has to free the skb + put the hard interface. Fixes: 8b4132b1447a ("batman-adv: Consume skb in batadv_frag_send_packet") Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/205dc8385dc863467f4f6ccec2e63254e6baf831 --- net/batman-adv/fragmentation.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c -index 9c561e6..0854ebd 100644 +index 9c561e683f4b8b68642b626b51a0dcda30260e97..0854ebd8613e9bf9044b04099b11341325d6e194 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -474,7 +474,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, diff --git a/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch b/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch index f4baf46..4fbdbad 100644 --- a/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch +++ b/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch @@ -24,7 +24,7 @@ Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e3bab02816097f 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c -index 0854ebd8..31e97e9a 100644 +index 0854ebd8613e9bf9044b04099b11341325d6e194..31e97e9aee0d543b68be091936888e1f6c9dd7eb 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -239,8 +239,10 @@ err_unlock: diff --git a/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch b/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch index 6dec0f6..7e5c9f5 100644 --- a/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch +++ b/batman-adv/patches/0004-batman-adv-Fix-transmission-of-final-16th-fragment.patch @@ -23,7 +23,7 @@ Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/464eff3b1768ff 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c -index 31e97e9a..11149e5b 100644 +index 31e97e9aee0d543b68be091936888e1f6c9dd7eb..11149e5be4e0ef9dfe2872e1d8d1f6dbb4ccdb14 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -501,6 +501,12 @@ int batadv_frag_send_packet(struct sk_buff *skb, diff --git a/batman-adv/patches/0005-batman-adv-Treat-NET_XMIT_CN-as-transmit-successfull.patch b/batman-adv/patches/0005-batman-adv-Treat-NET_XMIT_CN-as-transmit-successfull.patch new file mode 100644 index 0000000..9da1652 --- /dev/null +++ b/batman-adv/patches/0005-batman-adv-Treat-NET_XMIT_CN-as-transmit-successfull.patch @@ -0,0 +1,123 @@ +From: Gao Feng +Date: Mon, 21 Nov 2016 23:00:32 +0800 +Subject: [PATCH] batman-adv: Treat NET_XMIT_CN as transmit successfully + +The tc could return NET_XMIT_CN as one congestion notification, but +it does not mean the packet is lost. Other modules like ipvlan, +macvlan, and others treat NET_XMIT_CN as success too. + +So batman-adv should add the NET_XMIT_CN check. + +Signed-off-by: Gao Feng +Signed-off-by: Sven Eckelmann + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/1120b81c74187f489c08fc9438305071def089cc +--- + net/batman-adv/distributed-arp-table.c | 3 ++- + net/batman-adv/fragmentation.c | 2 +- + net/batman-adv/routing.c | 10 +++++----- + net/batman-adv/soft-interface.c | 2 +- + net/batman-adv/tp_meter.c | 2 +- + 5 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c +index 49576c5a3fe306a42c28c3901d2b2c6cce7d0b8e..3641765d55df049a5dbac35d322ebc537a0f0322 100644 +--- a/net/batman-adv/distributed-arp-table.c ++++ b/net/batman-adv/distributed-arp-table.c +@@ -659,7 +659,8 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, + } + + send_status = batadv_send_unicast_skb(tmp_skb, neigh_node); +- if (send_status == NET_XMIT_SUCCESS) { ++ if (send_status == NET_XMIT_SUCCESS || ++ send_status == NET_XMIT_CN) { + /* count the sent packet */ + switch (packet_subtype) { + case BATADV_P_DAT_DHT_GET: +diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c +index 11149e5be4e0ef9dfe2872e1d8d1f6dbb4ccdb14..d33f16b9b8ac13ba630bf9ac8c5f4f0ca79fc878 100644 +--- a/net/batman-adv/fragmentation.c ++++ b/net/batman-adv/fragmentation.c +@@ -517,7 +517,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, + batadv_add_counter(bat_priv, BATADV_CNT_FRAG_TX_BYTES, + skb_fragment->len + ETH_HLEN); + ret = batadv_send_unicast_skb(skb_fragment, neigh_node); +- if (ret != NET_XMIT_SUCCESS) { ++ if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) { + ret = NET_XMIT_DROP; + goto put_primary_if; + } +diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c +index 6713bdf414cdacdaf36ecd6ac516f99e079fb51e..6b08b26da4d94be9c8c5e9dc708ddc18d8282428 100644 +--- a/net/batman-adv/routing.c ++++ b/net/batman-adv/routing.c +@@ -262,7 +262,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, + icmph->ttl = BATADV_TTL; + + res = batadv_send_skb_to_orig(skb, orig_node, NULL); +- if (res == NET_XMIT_SUCCESS) ++ if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) + ret = NET_RX_SUCCESS; + + /* skb was consumed */ +@@ -330,7 +330,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, + icmp_packet->ttl = BATADV_TTL; + + res = batadv_send_skb_to_orig(skb, orig_node, NULL); +- if (res == NET_RX_SUCCESS) ++ if (res == NET_RX_SUCCESS || res == NET_XMIT_CN) + ret = NET_XMIT_SUCCESS; + + /* skb was consumed */ +@@ -424,7 +424,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, + + /* route it */ + res = batadv_send_skb_to_orig(skb, orig_node, recv_if); +- if (res == NET_XMIT_SUCCESS) ++ if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) + ret = NET_RX_SUCCESS; + + /* skb was consumed */ +@@ -719,14 +719,14 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, + + len = skb->len; + res = batadv_send_skb_to_orig(skb, orig_node, recv_if); +- if (res == NET_XMIT_SUCCESS) ++ if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) + ret = NET_RX_SUCCESS; + + /* skb was consumed */ + skb = NULL; + + /* translate transmit result into receive result */ +- if (res == NET_XMIT_SUCCESS) { ++ if (res == NET_XMIT_SUCCESS || res == NET_XMIT_CN) { + /* skb was transmitted and consumed */ + batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD); + batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES, +diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c +index 7b3494ae6ad93fd0d32391e5c88f5d636f43acd5..60516bbb7e8391f3063ba1e48c81288ffc7bef49 100644 +--- a/net/batman-adv/soft-interface.c ++++ b/net/batman-adv/soft-interface.c +@@ -386,7 +386,7 @@ send: + ret = batadv_send_skb_via_tt(bat_priv, skb, dst_hint, + vid); + } +- if (ret != NET_XMIT_SUCCESS) ++ if (ret != NET_XMIT_SUCCESS && ret != NET_XMIT_CN) + goto dropped_freed; + } + +diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c +index 981e8c5b07e9398c68df711d1d7b54e6e9333ead..c367c8316a822c70ee397bbe1266cd38f24a279b 100644 +--- a/net/batman-adv/tp_meter.c ++++ b/net/batman-adv/tp_meter.c +@@ -615,7 +615,7 @@ static int batadv_tp_send_msg(struct batadv_tp_vars *tp_vars, const u8 *src, + batadv_tp_fill_prerandom(tp_vars, data, data_len); + + r = batadv_send_skb_to_orig(skb, orig_node, NULL); +- if (r == NET_XMIT_SUCCESS) ++ if (r == NET_XMIT_SUCCESS || r == NET_XMIT_CN) + return 0; + + return BATADV_TP_REASON_CANT_SEND; diff --git a/batman-adv/patches/0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch b/batman-adv/patches/0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch new file mode 100644 index 0000000..d2ced52 --- /dev/null +++ b/batman-adv/patches/0006-batman-adv-don-t-add-loop-detect-macs-to-TT.patch @@ -0,0 +1,67 @@ +From: Simon Wunderlich +Date: Thu, 24 Nov 2016 16:11:01 +0100 +Subject: [PATCH] batman-adv: don't add loop detect macs to TT + +The bridge loop avoidance (BLA) feature of batman-adv sends packets to +probe for Mesh/LAN packet loops. Those packets are not sent by real +clients and should therefore not be added to the translation table (TT). + +Signed-off-by: Simon Wunderlich +Signed-off-by: Sven Eckelmann + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/447df986b83630a92ca9d33903023b7e1b2917f3 +--- + net/batman-adv/bridge_loop_avoidance.h | 18 ++++++++++++++++++ + net/batman-adv/soft-interface.c | 3 ++- + 2 files changed, 20 insertions(+), 1 deletion(-) + +diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h +index 1ae93e46fb98498c00082728ca91216d78e13298..2827cd3c13d2a35a3b296340a0aa123dbd032926 100644 +--- a/net/batman-adv/bridge_loop_avoidance.h ++++ b/net/batman-adv/bridge_loop_avoidance.h +@@ -20,6 +20,8 @@ + + #include "main.h" + ++#include ++#include + #include + + struct net_device; +@@ -27,6 +29,22 @@ struct netlink_callback; + struct seq_file; + struct sk_buff; + ++/** ++ * batadv_bla_is_loopdetect_mac - check if the mac address is from a loop detect ++ * frame sent by bridge loop avoidance ++ * @mac: mac address to check ++ * ++ * Return: true if the it looks like a loop detect frame ++ * (mac starts with BA:BE), false otherwise ++ */ ++static inline bool batadv_bla_is_loopdetect_mac(const uint8_t *mac) ++{ ++ if (mac[0] == 0xba && mac[1] == 0xbe) ++ return true; ++ ++ return false; ++} ++ + #ifdef CONFIG_BATMAN_ADV_BLA + bool batadv_bla_rx(struct batadv_priv *bat_priv, struct sk_buff *skb, + unsigned short vid, bool is_bcast); +diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c +index 60516bbb7e8391f3063ba1e48c81288ffc7bef49..4e447bf17332c191dda694b9b3e49e06073814fc 100644 +--- a/net/batman-adv/soft-interface.c ++++ b/net/batman-adv/soft-interface.c +@@ -258,7 +258,8 @@ static int batadv_interface_tx(struct sk_buff *skb, + ethhdr = eth_hdr(skb); + + /* Register the client MAC in the transtable */ +- if (!is_multicast_ether_addr(ethhdr->h_source)) { ++ if (!is_multicast_ether_addr(ethhdr->h_source) && ++ !batadv_bla_is_loopdetect_mac(ethhdr->h_source)) { + client_added = batadv_tt_local_add(soft_iface, ethhdr->h_source, + vid, skb->skb_iif, + skb->mark); diff --git a/batman-adv/patches/0007-batman-adv-decrease-maximum-fragment-size.patch b/batman-adv/patches/0007-batman-adv-decrease-maximum-fragment-size.patch new file mode 100644 index 0000000..03d84a0 --- /dev/null +++ b/batman-adv/patches/0007-batman-adv-decrease-maximum-fragment-size.patch @@ -0,0 +1,52 @@ +From: Matthias Schiffer +Date: Wed, 22 Feb 2017 17:25:41 +0100 +Subject: [PATCH] batman-adv: decrease maximum fragment size + +With this patch the maximum fragment size is reduced from 1400 to 1280 +bytes. + +Fragmentation v2 correctly uses the smaller of 1400 and the interface +MTU, thus generally supporting interfaces with an MTU < 1400 bytes, too. + +However, currently "Fragmentation v2" does not support re-fragmentation. +Which means that once a packet is split into two packets of 1400 + x +bytes for instance and the next hop provides an interface with an even +smaller MTU of 1280 bytes, then the larger fragment is lost. + +A maximum fragment size of 1280 bytes is a safer option as this is the +minimum MTU required by IPv6, making interfaces with an MTU < 1280 +rather exotic. + +Regarding performance, this should have no negative impact on unicast +traffic: Having some more bytes in the smaller and some less in the +larger does not change the sum of both fragments. + +Concerning TT, choosing 1280 bytes fragments might result in more TT +messages than necessary when a large network is bridged into batman-adv. +However, the TT overhead in general is marginal due to its reactive +nature, therefore such a performance impact on TT should not be +noticeable for a user. + +Cc: Matthias Schiffer +[linus.luessing@c0d3.blue: Added commit message] +Signed-off-by: Linus Lüssing +Signed-off-by: Sven Eckelmann + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/eb60b63140af5ec01ea0916837c2816cad10d6c1 +--- + net/batman-adv/main.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h +index a6cc8040a21dd24fb507683230fd66a9edb62458..5b7855560e8ad121c7b48da97807b6895be158fc 100644 +--- a/net/batman-adv/main.h ++++ b/net/batman-adv/main.h +@@ -168,7 +168,7 @@ enum batadv_uev_type { + /* Maximum number of fragments for one packet */ + #define BATADV_FRAG_MAX_FRAGMENTS 16 + /* Maxumim size of each fragment */ +-#define BATADV_FRAG_MAX_FRAG_SIZE 1400 ++#define BATADV_FRAG_MAX_FRAG_SIZE 1280 + /* Time to keep fragments while waiting for rest of the fragments */ + #define BATADV_FRAG_TIMEOUT 10000 + diff --git a/batman-adv/patches/0008-batman-adv-Keep-fragments-equally-sized.patch b/batman-adv/patches/0008-batman-adv-Keep-fragments-equally-sized.patch new file mode 100644 index 0000000..58af884 --- /dev/null +++ b/batman-adv/patches/0008-batman-adv-Keep-fragments-equally-sized.patch @@ -0,0 +1,90 @@ +From: Sven Eckelmann +Date: Wed, 22 Feb 2017 17:25:42 +0100 +Subject: [PATCH] batman-adv: Keep fragments equally sized + +The batman-adv fragmentation packets have the design problem that they +cannot be refragmented. This often leads to problems when networks are +incorrectly configured and don't use a common MTU. + +The sender could for example fragment a 1500 byte packet to fit in a 1280 +bytes large MTU. This would create a 1280 large packet and a 284 bytes +large packet. But the next hop is then not able to transport 1280 bytes to +its next hop. The 1280 byte large packet will be dropped but the 284 bytes +large packet will still be forwarded to its destination. + +This can partly being avoided by splitting packets more equally. In this +example, the two 782 bytes large packets could both potentially reach its +destination. + +Signed-off-by: Sven Eckelmann +Acked-by: Linus Lüssing + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/3caa5d14206ce8d4bd48bc931f213dec47ea1566 +--- + net/batman-adv/fragmentation.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) + +diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c +index d33f16b9b8ac13ba630bf9ac8c5f4f0ca79fc878..70e512111528b0345889cea4ffd0ad5d984a4e6a 100644 +--- a/net/batman-adv/fragmentation.c ++++ b/net/batman-adv/fragmentation.c +@@ -404,7 +404,7 @@ out: + * batadv_frag_create - create a fragment from skb + * @skb: skb to create fragment from + * @frag_head: header to use in new fragment +- * @mtu: size of new fragment ++ * @fragment_size: size of new fragment + * + * Split the passed skb into two fragments: A new one with size matching the + * passed mtu and the old one with the rest. The new skb contains data from the +@@ -414,11 +414,11 @@ out: + */ + static struct sk_buff *batadv_frag_create(struct sk_buff *skb, + struct batadv_frag_packet *frag_head, +- unsigned int mtu) ++ unsigned int fragment_size) + { + struct sk_buff *skb_fragment; + unsigned int header_size = sizeof(*frag_head); +- unsigned int fragment_size = mtu - header_size; ++ unsigned int mtu = fragment_size + header_size; + + skb_fragment = netdev_alloc_skb(NULL, mtu + ETH_HLEN); + if (!skb_fragment) +@@ -456,7 +456,7 @@ int batadv_frag_send_packet(struct sk_buff *skb, + struct sk_buff *skb_fragment; + unsigned int mtu = neigh_node->if_incoming->net_dev->mtu; + unsigned int header_size = sizeof(frag_header); +- unsigned int max_fragment_size, max_packet_size; ++ unsigned int max_fragment_size, num_fragments; + int ret; + + /* To avoid merge and refragmentation at next-hops we never send +@@ -464,10 +464,15 @@ int batadv_frag_send_packet(struct sk_buff *skb, + */ + mtu = min_t(unsigned int, mtu, BATADV_FRAG_MAX_FRAG_SIZE); + max_fragment_size = mtu - header_size; +- max_packet_size = max_fragment_size * BATADV_FRAG_MAX_FRAGMENTS; ++ ++ if (skb->len == 0 || max_fragment_size == 0) ++ return -EINVAL; ++ ++ num_fragments = (skb->len - 1) / max_fragment_size + 1; ++ max_fragment_size = (skb->len - 1) / num_fragments + 1; + + /* Don't even try to fragment, if we need more than 16 fragments */ +- if (skb->len > max_packet_size) { ++ if (num_fragments > BATADV_FRAG_MAX_FRAGMENTS) { + ret = -EAGAIN; + goto free_skb; + } +@@ -507,7 +512,8 @@ int batadv_frag_send_packet(struct sk_buff *skb, + goto put_primary_if; + } + +- skb_fragment = batadv_frag_create(skb, &frag_header, mtu); ++ skb_fragment = batadv_frag_create(skb, &frag_header, ++ max_fragment_size); + if (!skb_fragment) { + ret = -ENOMEM; + goto put_primary_if; diff --git a/batman-adv/patches/0009-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch b/batman-adv/patches/0009-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch new file mode 100644 index 0000000..3ef17bd --- /dev/null +++ b/batman-adv/patches/0009-batman-adv-Initialize-gw-sel_class-via-batadv_algo.patch @@ -0,0 +1,144 @@ +From: Sven Eckelmann +Date: Sat, 4 Mar 2017 16:33:31 +0100 +Subject: [PATCH] batman-adv: Initialize gw sel_class via batadv_algo + +The gateway selection class variable is shared between different algorithm +versions. But the interpretation of the content is algorithm specific. The +initialization is therefore also algorithm specific. + +But this was implemented incorrectly and the initialization for BATMAN_V +always overwrote the value previously written for BATMAN_IV. This could +only be avoided when BATMAN_V was disabled during compile time. + +Using a special batadv_algo hook for this initialization avoids this +problem. + +Fixes: 80b2d47be2c7 ("batman-adv: B.A.T.M.A.N. V - implement GW selection logic") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/ef565a1434966750644affda86fd11b0b69edbfe +--- + net/batman-adv/bat_iv_ogm.c | 11 +++++++++++ + net/batman-adv/bat_v.c | 14 +++++++++++--- + net/batman-adv/gateway_common.c | 5 +++++ + net/batman-adv/soft-interface.c | 1 - + net/batman-adv/types.h | 2 ++ + 5 files changed, 29 insertions(+), 4 deletions(-) + +diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c +index f00f666e2ccd4714bb7a5210c48e39edb40e0c17..7bfd0d7ef49df8e699f91e2b827b824aa3657c0d 100644 +--- a/net/batman-adv/bat_iv_ogm.c ++++ b/net/batman-adv/bat_iv_ogm.c +@@ -2477,6 +2477,16 @@ static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface) + batadv_iv_ogm_schedule(hard_iface); + } + ++/** ++ * batadv_iv_init_sel_class - initialize GW selection class ++ * @bat_priv: the bat priv with all the soft interface information ++ */ ++static void batadv_iv_init_sel_class(struct batadv_priv *bat_priv) ++{ ++ /* set default TQ difference threshold to 20 */ ++ atomic_set(&bat_priv->gw.sel_class, 20); ++} ++ + static struct batadv_gw_node * + batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) + { +@@ -2823,6 +2833,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { + .del_if = batadv_iv_ogm_orig_del_if, + }, + .gw = { ++ .init_sel_class = batadv_iv_init_sel_class, + .get_best_gw_node = batadv_iv_gw_get_best_gw_node, + .is_eligible = batadv_iv_gw_is_eligible, + #ifdef CONFIG_BATMAN_ADV_DEBUGFS +diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c +index 2ac612d7bab4d0b4035c9e476dab17536349dca3..2e2471ca84e392faac7fd6537bf137161e27542a 100644 +--- a/net/batman-adv/bat_v.c ++++ b/net/batman-adv/bat_v.c +@@ -668,6 +668,16 @@ err_ifinfo1: + return ret; + } + ++/** ++ * batadv_v_init_sel_class - initialize GW selection class ++ * @bat_priv: the bat priv with all the soft interface information ++ */ ++static void batadv_v_init_sel_class(struct batadv_priv *bat_priv) ++{ ++ /* set default throughput difference threshold to 5Mbps */ ++ atomic_set(&bat_priv->gw.sel_class, 50); ++} ++ + static ssize_t batadv_v_store_sel_class(struct batadv_priv *bat_priv, + char *buff, size_t count) + { +@@ -1052,6 +1062,7 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = { + .dump = batadv_v_orig_dump, + }, + .gw = { ++ .init_sel_class = batadv_v_init_sel_class, + .store_sel_class = batadv_v_store_sel_class, + .show_sel_class = batadv_v_show_sel_class, + .get_best_gw_node = batadv_v_gw_get_best_gw_node, +@@ -1092,9 +1103,6 @@ int batadv_v_mesh_init(struct batadv_priv *bat_priv) + if (ret < 0) + return ret; + +- /* set default throughput difference threshold to 5Mbps */ +- atomic_set(&bat_priv->gw.sel_class, 50); +- + return 0; + } + +diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c +index 21184810d89f69e372673aff221a74382945491d..3e3f91ab694fb8e61ecb4df356e72334b56e0fbe 100644 +--- a/net/batman-adv/gateway_common.c ++++ b/net/batman-adv/gateway_common.c +@@ -253,6 +253,11 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, + */ + void batadv_gw_init(struct batadv_priv *bat_priv) + { ++ if (bat_priv->algo_ops->gw.init_sel_class) ++ bat_priv->algo_ops->gw.init_sel_class(bat_priv); ++ else ++ atomic_set(&bat_priv->gw.sel_class, 1); ++ + batadv_tvlv_handler_register(bat_priv, batadv_gw_tvlv_ogm_handler_v1, + NULL, BATADV_TVLV_GW, 1, + BATADV_TVLV_HANDLER_OGM_CIFNOTFND); +diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c +index 4e447bf17332c191dda694b9b3e49e06073814fc..08432b14386a53c771c54b9eb38893d94c6f9b53 100644 +--- a/net/batman-adv/soft-interface.c ++++ b/net/batman-adv/soft-interface.c +@@ -821,7 +821,6 @@ static int batadv_softif_init_late(struct net_device *dev) + atomic_set(&bat_priv->mcast.num_want_all_ipv6, 0); + #endif + atomic_set(&bat_priv->gw.mode, BATADV_GW_MODE_OFF); +- atomic_set(&bat_priv->gw.sel_class, 20); + atomic_set(&bat_priv->gw.bandwidth_down, 100); + atomic_set(&bat_priv->gw.bandwidth_up, 20); + atomic_set(&bat_priv->orig_interval, 1000); +diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h +index e913aee28c98bf77cdd7fe92496fa4b188ff9604..5137d859694c28f60cad33325127617c047412ff 100644 +--- a/net/batman-adv/types.h ++++ b/net/batman-adv/types.h +@@ -1489,6 +1489,7 @@ struct batadv_algo_orig_ops { + + /** + * struct batadv_algo_gw_ops - mesh algorithm callbacks (GW specific) ++ * @init_sel_class: initialize GW selection class (optional) + * @store_sel_class: parse and stores a new GW selection class (optional) + * @show_sel_class: prints the current GW selection class (optional) + * @get_best_gw_node: select the best GW from the list of available nodes +@@ -1499,6 +1500,7 @@ struct batadv_algo_orig_ops { + * @dump: dump gateways to a netlink socket (optional) + */ + struct batadv_algo_gw_ops { ++ void (*init_sel_class)(struct batadv_priv *bat_priv); + ssize_t (*store_sel_class)(struct batadv_priv *bat_priv, char *buff, + size_t count); + ssize_t (*show_sel_class)(struct batadv_priv *bat_priv, char *buff); diff --git a/batman-adv/patches/0010-batman-adv-prevent-multiple-ARP-replies-sent-by-gate.patch b/batman-adv/patches/0010-batman-adv-prevent-multiple-ARP-replies-sent-by-gate.patch new file mode 100644 index 0000000..a69b270 --- /dev/null +++ b/batman-adv/patches/0010-batman-adv-prevent-multiple-ARP-replies-sent-by-gate.patch @@ -0,0 +1,142 @@ +From: Andreas Pape +Date: Mon, 5 Sep 2016 13:20:25 +0200 +Subject: [PATCH] batman-adv: prevent multiple ARP replies sent by gateways if dat enabled + +If dat is enabled it must be made sure that only the backbone gw which has +claimed the remote destination for the ARP request answers the ARP request +directly if the MAC address is known due to the local dat table. This +prevents multiple ARP replies in a common backbone if more than one +gateway already knows the remote mac searched for in the ARP request. + +Signed-off-by: Andreas Pape +Acked-by: Simon Wunderlich +[sven@narfation.org: fix conflicts with current version] +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/0c794961bc0d32386cffdc6d41c5ee21d9638e5b +--- + net/batman-adv/bridge_loop_avoidance.c | 49 ++++++++++++++++++++++++++++++++++ + net/batman-adv/bridge_loop_avoidance.h | 11 ++++++++ + net/batman-adv/distributed-arp-table.c | 15 +++++++++++ + 3 files changed, 75 insertions(+) + +diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c +index e7f690b571ea9be8ace25843d6e187a907486b99..41ab4a67a07b264bccdc5bccf73920909ff35c40 100644 +--- a/net/batman-adv/bridge_loop_avoidance.c ++++ b/net/batman-adv/bridge_loop_avoidance.c +@@ -2450,3 +2450,52 @@ out: + + return ret; + } ++ ++#ifdef CONFIG_BATMAN_ADV_DAT ++/** ++ * batadv_bla_check_claim - check if address is claimed ++ * ++ * @bat_priv: the bat priv with all the soft interface information ++ * @addr: mac address of which the claim status is checked ++ * @vid: the VLAN ID ++ * ++ * addr is checked if this address is claimed by the local device itself. ++ * ++ * Return: true if bla is disabled or the mac is claimed by the device, ++ * false if the device addr is already claimed by another gateway ++ */ ++bool batadv_bla_check_claim(struct batadv_priv *bat_priv, ++ u8 *addr, unsigned short vid) ++{ ++ struct batadv_bla_claim search_claim; ++ struct batadv_bla_claim *claim = NULL; ++ struct batadv_hard_iface *primary_if = NULL; ++ bool ret = true; ++ ++ if (!atomic_read(&bat_priv->bridge_loop_avoidance)) ++ return ret; ++ ++ primary_if = batadv_primary_if_get_selected(bat_priv); ++ if (!primary_if) ++ return ret; ++ ++ /* First look if the mac address is claimed */ ++ ether_addr_copy(search_claim.addr, addr); ++ search_claim.vid = vid; ++ ++ claim = batadv_claim_hash_find(bat_priv, &search_claim); ++ ++ /* If there is a claim and we are not owner of the claim, ++ * return false. ++ */ ++ if (claim) { ++ if (!batadv_compare_eth(claim->backbone_gw->orig, ++ primary_if->net_dev->dev_addr)) ++ ret = false; ++ batadv_claim_put(claim); ++ } ++ ++ batadv_hardif_put(primary_if); ++ return ret; ++} ++#endif +diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h +index 2827cd3c13d2a35a3b296340a0aa123dbd032926..133227c578e73fb998b540fdf361472a21e0c602 100644 +--- a/net/batman-adv/bridge_loop_avoidance.h ++++ b/net/batman-adv/bridge_loop_avoidance.h +@@ -69,6 +69,10 @@ void batadv_bla_status_update(struct net_device *net_dev); + int batadv_bla_init(struct batadv_priv *bat_priv); + void batadv_bla_free(struct batadv_priv *bat_priv); + int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb); ++#ifdef CONFIG_BATMAN_ADV_DAT ++bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr, ++ unsigned short vid); ++#endif + #define BATADV_BLA_CRC_INIT 0 + #else /* ifdef CONFIG_BATMAN_ADV_BLA */ + +@@ -145,6 +149,13 @@ static inline int batadv_bla_backbone_dump(struct sk_buff *msg, + return -EOPNOTSUPP; + } + ++static inline ++bool batadv_bla_check_claim(struct batadv_priv *bat_priv, u8 *addr, ++ unsigned short vid) ++{ ++ return true; ++} ++ + #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ + + #endif /* ifndef _NET_BATMAN_ADV_BLA_H_ */ +diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c +index 3641765d55df049a5dbac35d322ebc537a0f0322..4cfc9672507ba718d975a2f869bb89fc38e0d934 100644 +--- a/net/batman-adv/distributed-arp-table.c ++++ b/net/batman-adv/distributed-arp-table.c +@@ -43,6 +43,7 @@ + #include + #include + ++#include "bridge_loop_avoidance.h" + #include "hard-interface.h" + #include "hash.h" + #include "log.h" +@@ -1041,6 +1042,20 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, + goto out; + } + ++ /* If BLA is enabled, only send ARP replies if we have claimed ++ * the destination for the ARP request or if no one else of ++ * the backbone gws belonging to our backbone has claimed the ++ * destination. ++ */ ++ if (!batadv_bla_check_claim(bat_priv, ++ dat_entry->mac_addr, vid)) { ++ batadv_dbg(BATADV_DBG_DAT, bat_priv, ++ "Device %pM claimed by another backbone gw. Don't send ARP reply!", ++ dat_entry->mac_addr); ++ ret = true; ++ goto out; ++ } ++ + skb_new = batadv_dat_arp_create_reply(bat_priv, ip_dst, ip_src, + dat_entry->mac_addr, + hw_src, vid); diff --git a/batman-adv/patches/0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch b/batman-adv/patches/0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch new file mode 100644 index 0000000..8d83671 --- /dev/null +++ b/batman-adv/patches/0011-batman-adv-prevent-duplication-of-ARP-replies-when-D.patch @@ -0,0 +1,91 @@ +From: Andreas Pape +Date: Mon, 5 Sep 2016 13:20:26 +0200 +Subject: [PATCH] batman-adv: prevent duplication of ARP replies when DAT is used + +If none of the backbone gateways in a bla setup has already knowledge of +the mac address searched for in an incoming ARP request from the backbone +an address resolution via the DHT of DAT is started. The gateway can send +several ARP requests to different DHT nodes and therefore can get several +replies. This patch assures that not all of the possible ARP replies are +returned to the backbone by checking the local DAT cache of the gateway. +If there is an entry in the local cache the gateway has already learned +the requested address and there is no need to forward the additional reply +to the backbone. +Furthermore it is checked if this gateway has claimed the source of the ARP +reply and only forwards it to the backbone if it has claimed the source or +if there is no claim at all. + +Signed-off-by: Andreas Pape +Acked-by: Simon Wunderlich +[sven@narfation.org: fix conflicts with current version] +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/81e422051cf0403e40615eb306d0ddaaddfee611 +--- + net/batman-adv/distributed-arp-table.c | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c +index 4cfc9672507ba718d975a2f869bb89fc38e0d934..16216532c1d82c09337a9c5e7a4cd5b4ad3ded5d 100644 +--- a/net/batman-adv/distributed-arp-table.c ++++ b/net/batman-adv/distributed-arp-table.c +@@ -1205,6 +1205,7 @@ void batadv_dat_snoop_outgoing_arp_reply(struct batadv_priv *bat_priv, + bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, + struct sk_buff *skb, int hdr_size) + { ++ struct batadv_dat_entry *dat_entry = NULL; + u16 type; + __be32 ip_src, ip_dst; + u8 *hw_src, *hw_dst; +@@ -1227,12 +1228,41 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, + hw_dst = batadv_arp_hw_dst(skb, hdr_size); + ip_dst = batadv_arp_ip_dst(skb, hdr_size); + ++ /* If ip_dst is already in cache and has the right mac address, ++ * drop this frame if this ARP reply is destined for us because it's ++ * most probably an ARP reply generated by another node of the DHT. ++ * We have most probably received already a reply earlier. Delivering ++ * this frame would lead to doubled receive of an ARP reply. ++ */ ++ dat_entry = batadv_dat_entry_hash_find(bat_priv, ip_src, vid); ++ if (dat_entry && batadv_compare_eth(hw_src, dat_entry->mac_addr)) { ++ batadv_dbg(BATADV_DBG_DAT, bat_priv, "Doubled ARP reply removed: ARP MSG = [src: %pM-%pI4 dst: %pM-%pI4]; dat_entry: %pM-%pI4\n", ++ hw_src, &ip_src, hw_dst, &ip_dst, ++ dat_entry->mac_addr, &dat_entry->ip); ++ dropped = true; ++ goto out; ++ } ++ + /* Update our internal cache with both the IP addresses the node got + * within the ARP reply + */ + batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid); + batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid); + ++ /* If BLA is enabled, only forward ARP replies if we have claimed the ++ * source of the ARP reply or if no one else of the same backbone has ++ * already claimed that client. This prevents that different gateways ++ * to the same backbone all forward the ARP reply leading to multiple ++ * replies in the backbone. ++ */ ++ if (!batadv_bla_check_claim(bat_priv, hw_src, vid)) { ++ batadv_dbg(BATADV_DBG_DAT, bat_priv, ++ "Device %pM claimed by another backbone gw. Drop ARP reply.\n", ++ hw_src); ++ dropped = true; ++ goto out; ++ } ++ + /* if this REPLY is directed to a client of mine, let's deliver the + * packet to the interface + */ +@@ -1245,6 +1275,8 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv, + out: + if (dropped) + kfree_skb(skb); ++ if (dat_entry) ++ batadv_dat_entry_put(dat_entry); + /* if dropped == false -> deliver to the interface */ + return dropped; + } diff --git a/batman-adv/patches/0012-batman-adv-drop-unicast-packets-from-other-backbone-.patch b/batman-adv/patches/0012-batman-adv-drop-unicast-packets-from-other-backbone-.patch new file mode 100644 index 0000000..29f3edb --- /dev/null +++ b/batman-adv/patches/0012-batman-adv-drop-unicast-packets-from-other-backbone-.patch @@ -0,0 +1,69 @@ +From: Andreas Pape +Date: Mon, 5 Sep 2016 13:20:27 +0200 +Subject: [PATCH] batman-adv: drop unicast packets from other backbone gw + +Additional dropping of unicast packets received from another backbone gw if +the same backbone network before being forwarded to the same backbone again +is necessary. It was observed in a test setup that in rare cases these +frames lead to looping unicast traffic backbone->mesh->backbone. + +Signed-off-by: Andreas Pape +Acked-by: Simon Wunderlich +[sven@narfation.org: fix conflicts with current version] +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/bfe2a1971f43ef540ef0440d319542fa7d41d81f +--- + net/batman-adv/routing.c | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c +index 6b08b26da4d94be9c8c5e9dc708ddc18d8282428..5190683424b89d1fa7c86895000bc6656e6a65dd 100644 +--- a/net/batman-adv/routing.c ++++ b/net/batman-adv/routing.c +@@ -942,15 +942,17 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, + struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface); + struct batadv_unicast_packet *unicast_packet; + struct batadv_unicast_4addr_packet *unicast_4addr_packet; +- u8 *orig_addr; +- struct batadv_orig_node *orig_node = NULL; ++ u8 *orig_addr, *orig_addr_gw; ++ struct batadv_orig_node *orig_node = NULL, *orig_node_gw = NULL; + int check, hdr_size = sizeof(*unicast_packet); + enum batadv_subtype subtype; +- bool is4addr; ++ struct ethhdr *ethhdr; + int ret = NET_RX_DROP; ++ bool is4addr, is_gw; + + unicast_packet = (struct batadv_unicast_packet *)skb->data; + unicast_4addr_packet = (struct batadv_unicast_4addr_packet *)skb->data; ++ ethhdr = eth_hdr(skb); + + is4addr = unicast_packet->packet_type == BATADV_UNICAST_4ADDR; + /* the caller function should have already pulled 2 bytes */ +@@ -973,6 +975,23 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, + + /* packet for me */ + if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) { ++ /* If this is a unicast packet from another backgone gw, ++ * drop it. ++ */ ++ orig_addr_gw = ethhdr->h_source; ++ orig_node_gw = batadv_orig_hash_find(bat_priv, orig_addr_gw); ++ if (orig_node_gw) { ++ is_gw = batadv_bla_is_backbone_gw(skb, orig_node_gw, ++ hdr_size); ++ batadv_orig_node_put(orig_node_gw); ++ if (is_gw) { ++ batadv_dbg(BATADV_DBG_BLA, bat_priv, ++ "Dropped unicast pkt received from another backbone gw %pM.\n", ++ orig_addr_gw); ++ return NET_RX_DROP; ++ } ++ } ++ + if (is4addr) { + subtype = unicast_4addr_packet->subtype; + batadv_dat_inc_counter(bat_priv, subtype); diff --git a/batman-adv/patches/0013-batman-adv-fix-memory-leak-when-dropping-packet-from.patch b/batman-adv/patches/0013-batman-adv-fix-memory-leak-when-dropping-packet-from.patch new file mode 100644 index 0000000..0a074b2 --- /dev/null +++ b/batman-adv/patches/0013-batman-adv-fix-memory-leak-when-dropping-packet-from.patch @@ -0,0 +1,33 @@ +From: Andreas Pape +Date: Fri, 19 May 2017 10:01:42 +0200 +Subject: [PATCH] batman-adv: fix memory leak when dropping packet from other gateway + +The skb must be released in the receive handler since b91a2543b4c1 +("batman-adv: Consume skb in receive handlers"). Just returning NET_RX_DROP +will no longer automatically free the memory. This results in memory leaks +when unicast packets from other backbones must be dropped because they +share a common backbone. + +Fixes: bfe2a1971f43 ("batman-adv: drop unicast packets from other backbone gw") +Signed-off-by: Andreas Pape +[sven@narfation.org: adjust commit message] +Signed-off-by: Sven Eckelmann + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/a58feb79ed1447e3e83f3b0b1a23779886869f39 +--- + net/batman-adv/routing.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c +index 5190683424b89d1fa7c86895000bc6656e6a65dd..213cc01ad00392f7cbd4efd9d4796f76691d2d9e 100644 +--- a/net/batman-adv/routing.c ++++ b/net/batman-adv/routing.c +@@ -988,7 +988,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, + batadv_dbg(BATADV_DBG_BLA, bat_priv, + "Dropped unicast pkt received from another backbone gw %pM.\n", + orig_addr_gw); +- return NET_RX_DROP; ++ goto free_skb; + } + } + diff --git a/batman-adv/patches/0014-batman-adv-handle-race-condition-for-claims-between-.patch b/batman-adv/patches/0014-batman-adv-handle-race-condition-for-claims-between-.patch new file mode 100644 index 0000000..55b8652 --- /dev/null +++ b/batman-adv/patches/0014-batman-adv-handle-race-condition-for-claims-between-.patch @@ -0,0 +1,67 @@ +From: Andreas Pape +Date: Mon, 5 Sep 2016 13:20:29 +0200 +Subject: [PATCH] batman-adv: handle race condition for claims between gateways + +Consider the following situation which has been found in a test setup: +Gateway B has claimed client C and gateway A has the same backbone +network as B. C sends a broad- or multicast to B and directly after +this packet decides to send another packet to A due to a better TQ +value. B will forward the broad-/multicast into the backbone as it is +the responsible gw and after that A will claim C as it has been +chosen by C as the best gateway. If it now happens that A claims C +before it has received the broad-/multicast forwarded by B (due to +backbone topology or due to some delay in B when forwarding the +packet) we get a critical situation: in the current code A will +immediately unclaim C when receiving the multicast due to the +roaming client scenario although the position of C has not changed +in the mesh. If this happens the multi-/broadcast forwarded by B +will be sent back into the mesh by A and we have looping packets +until one of the gateways claims C again. +In order to prevent this, unclaiming of a client due to the roaming +client scenario is only done after a certain time is expired after +the last claim of the client. 100 ms are used here, which should be +slow enough for big backbones and slow gateways but fast enough not +to break the roaming client use case. + +Acked-by: Simon Wunderlich +Signed-off-by: Andreas Pape +[sven@narfation.org: fix conflicts with current version] +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/cbb2ccc101e220b339989d5a51c0ca226ceda792 +--- + net/batman-adv/bridge_loop_avoidance.c | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c +index 41ab4a67a07b264bccdc5bccf73920909ff35c40..1e6e5d4468ad50c221ea5a0d436678d16c5e154f 100644 +--- a/net/batman-adv/bridge_loop_avoidance.c ++++ b/net/batman-adv/bridge_loop_avoidance.c +@@ -1964,10 +1964,22 @@ bool batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, + /* if yes, the client has roamed and we have + * to unclaim it. + */ +- batadv_handle_unclaim(bat_priv, primary_if, +- primary_if->net_dev->dev_addr, +- ethhdr->h_source, vid); +- goto allow; ++ if (batadv_has_timed_out(claim->lasttime, 100)) { ++ /* only unclaim if the last claim entry is ++ * older than 100 ms to make sure we really ++ * have a roaming client here. ++ */ ++ batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Roaming client %pM detected. Unclaim it.\n", ++ ethhdr->h_source); ++ batadv_handle_unclaim(bat_priv, primary_if, ++ primary_if->net_dev->dev_addr, ++ ethhdr->h_source, vid); ++ goto allow; ++ } else { ++ batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla_tx(): Race for claim %pM detected. Drop packet.\n", ++ ethhdr->h_source); ++ goto handled; ++ } + } + + /* check if it is a multicast/broadcast frame */ diff --git a/batman-adv/patches/0015-batman-adv-Fix-rx-packet-bytes-stats-on-local-ARP-re.patch b/batman-adv/patches/0015-batman-adv-Fix-rx-packet-bytes-stats-on-local-ARP-re.patch new file mode 100644 index 0000000..7a5b4fd --- /dev/null +++ b/batman-adv/patches/0015-batman-adv-Fix-rx-packet-bytes-stats-on-local-ARP-re.patch @@ -0,0 +1,36 @@ +From: Sven Eckelmann +Date: Wed, 5 Apr 2017 16:26:17 +0200 +Subject: [PATCH] batman-adv: Fix rx packet/bytes stats on local ARP reply + +The stats are generated by batadv_interface_stats and must not be stored +directly in the net_device stats member variable. The batadv_priv +bat_counters information is assembled when ndo_get_stats is called. The +stats previously stored in net_device::stats is then overwritten. + +The batman-adv counters must therefore be increased when an ARP packet is +answered locally via the distributed arp table. + +Fixes: 75ca71d858f5 ("batman-adv: Distributed ARP Table - add snooping functions for ARP messages") +Signed-off-by: Sven Eckelmann + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/426ddde4ffe0c7345d1a7409bf899f89ddea26d3 +--- + net/batman-adv/distributed-arp-table.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c +index 16216532c1d82c09337a9c5e7a4cd5b4ad3ded5d..4d982e63a3ab269e3d3b1e7a9d5f205638051603 100644 +--- a/net/batman-adv/distributed-arp-table.c ++++ b/net/batman-adv/distributed-arp-table.c +@@ -1064,8 +1064,9 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv, + + skb_new->protocol = eth_type_trans(skb_new, + bat_priv->soft_iface); +- bat_priv->stats.rx_packets++; +- bat_priv->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size; ++ batadv_inc_counter(bat_priv, BATADV_CNT_RX); ++ batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES, ++ skb->len + ETH_HLEN + hdr_size); + bat_priv->soft_iface->last_rx = jiffies; + + netif_rx(skb_new); diff --git a/batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch b/batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch new file mode 100644 index 0000000..225cf58 --- /dev/null +++ b/batman-adv/patches/0016-batman-adv-do-not-add-loop-detection-mac-addresses-t.patch @@ -0,0 +1,35 @@ +From: Simon Wunderlich +Date: Thu, 1 Jun 2017 17:11:24 +0200 +Subject: [PATCH] batman-adv: do not add loop detection mac addresses to global tt + +This change has been made for local TT already, add another one for +global TT - but only for temporary entries (aka speedy join), to prevent +inconsistencies between local and global tables in case an older +batman-adv version is still announcing those entries from its local +table. + +Signed-off-by: Simon Wunderlich +Signed-off-by: Sven Eckelmann + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/1f1b6c0d96129e6445652061d93a7fb1f0476fa3 +--- + net/batman-adv/translation-table.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c +index 30ecbfb40adfa6f9f1c777fc93e42df8c39e4581..199da2abe6ab92161ab66faa01fa3d06aeb68c89 100644 +--- a/net/batman-adv/translation-table.c ++++ b/net/batman-adv/translation-table.c +@@ -4012,6 +4012,12 @@ bool batadv_tt_add_temporary_global_entry(struct batadv_priv *bat_priv, + { + bool ret = false; + ++ /* ignore loop detect macs, they are not supposed to be in the tt local ++ * data as well. ++ */ ++ if (batadv_bla_is_loopdetect_mac(addr)) ++ return false; ++ + if (!batadv_tt_global_add(bat_priv, orig_node, addr, vid, + BATADV_TT_CLIENT_TEMP, + atomic_read(&orig_node->last_ttvn))) diff --git a/batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch b/batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch new file mode 100644 index 0000000..6728e45 --- /dev/null +++ b/batman-adv/patches/0017-batman-adv-Use-default-throughput-value-on-cfg80211-.patch @@ -0,0 +1,35 @@ +From: Sven Eckelmann +Date: Fri, 9 Jun 2017 17:06:50 +0200 +Subject: [PATCH] batman-adv: Use default throughput value on cfg80211 error + +A wifi interface should never be handled like an ethernet devices. The +parser of the cfg80211 output must therefore skip the ethtool code when +cfg80211_get_station returned an error. + +Fixes: 01b1fe819ee0 ("batman-adv: refactor wifi interface detection") +Signed-off-by: Sven Eckelmann +Reviewed-by: Marek Lindner +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/76ef29071b0050f972a626747d034a494a7195d7 +--- + net/batman-adv/bat_v_elp.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c +index f2fb2f05b6bf280d2b5fae26ed10288f73345f16..7c54a9291c9eaed75dfdfdfbd200f84c51576cb3 100644 +--- a/net/batman-adv/bat_v_elp.c ++++ b/net/batman-adv/bat_v_elp.c +@@ -109,8 +109,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) + */ + return 0; + } +- if (!ret) +- return sinfo.expected_throughput / 100; ++ if (ret) ++ goto default_throughput; ++ ++ return sinfo.expected_throughput / 100; + } + + /* if not a wifi interface, check if this device provides data via diff --git a/batman-adv/patches/0018-batman-adv-Accept-only-filled-wifi-station-info.patch b/batman-adv/patches/0018-batman-adv-Accept-only-filled-wifi-station-info.patch new file mode 100644 index 0000000..96e52e3 --- /dev/null +++ b/batman-adv/patches/0018-batman-adv-Accept-only-filled-wifi-station-info.patch @@ -0,0 +1,98 @@ +From: Sven Eckelmann +Date: Fri, 9 Jun 2017 17:06:51 +0200 +Subject: [PATCH] batman-adv: Accept only filled wifi station info + +The wifi driver can decide to not provide parts of the station info. For +example, the expected throughput of the station can be omitted when the +used rate control doesn't provide this kind of information. + +The B.A.T.M.A.N. V implementation must therefore check the filled bitfield +before it tries to access the expected_throughput of the returned +station_info. + +Reported-by: Alvaro Antelo +Fixes: 5c3245172c01 ("batman-adv: ELP - compute the metric based on the estimated throughput") +Signed-off-by: Sven Eckelmann +Reviewed-by: Marek Lindner +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/1e26904b364ceffe9ca7d6da7412e70fb2a04178 +--- + compat-include/linux/nl80211.h | 14 ++++++++++++++ + compat-include/uapi/linux/nl80211.h | 16 ++++++++++++++++ + net/batman-adv/bat_v_elp.c | 4 ++++ + 3 files changed, 34 insertions(+) + create mode 100644 compat-include/linux/nl80211.h + create mode 100644 compat-include/uapi/linux/nl80211.h + +diff --git a/compat-include/linux/nl80211.h b/compat-include/linux/nl80211.h +new file mode 100644 +index 0000000000000000000000000000000000000000..e6654df8cd67caa52a16a1f709141d7415b9f523 +--- /dev/null ++++ b/compat-include/linux/nl80211.h +@@ -0,0 +1,14 @@ ++#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_NL80211_H_ ++#define _NET_BATMAN_ADV_COMPAT_LINUX_NL80211_H_ ++ ++#include ++#include_next ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) ++ ++/* Linux 3.15 misses the uapi include.... */ ++#include ++ ++#endif /* < KERNEL_VERSION(3, 16, 0) */ ++ ++#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NL80211_H_ */ +diff --git a/compat-include/uapi/linux/nl80211.h b/compat-include/uapi/linux/nl80211.h +new file mode 100644 +index 0000000000000000000000000000000000000000..06f5625af21360be5718a1a6f7e8949f6739c927 +--- /dev/null ++++ b/compat-include/uapi/linux/nl80211.h +@@ -0,0 +1,16 @@ ++#ifndef _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_NL80211_H_ ++#define _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_NL80211_H_ ++ ++#include ++#include_next ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) ++ ++/* for batadv_v_elp_get_throughput which would have used ++ * STATION_INFO_EXPECTED_THROUGHPUT in Linux 4.0.0 ++ */ ++#define NL80211_STA_INFO_EXPECTED_THROUGHPUT 28 ++ ++#endif /* < KERNEL_VERSION(4, 0, 0) */ ++ ++#endif /* _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_NL80211_H_ */ +diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c +index 7c54a9291c9eaed75dfdfdfbd200f84c51576cb3..06b2924f4cb7dde54bab97ad2d28aecd9b1a4ceb 100644 +--- a/net/batman-adv/bat_v_elp.c ++++ b/net/batman-adv/bat_v_elp.c +@@ -19,6 +19,7 @@ + #include "main.h" + + #include ++#include + #include + #include + #include +@@ -29,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -111,6 +113,8 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) + } + if (ret) + goto default_throughput; ++ if (!(sinfo.filled & BIT(NL80211_STA_INFO_EXPECTED_THROUGHPUT))) ++ goto default_throughput; + + return sinfo.expected_throughput / 100; + } diff --git a/batman-adv/patches/0019-batman-adv-fix-TT-sync-flag-inconsistencies.patch b/batman-adv/patches/0019-batman-adv-fix-TT-sync-flag-inconsistencies.patch new file mode 100644 index 0000000..ef2e21f --- /dev/null +++ b/batman-adv/patches/0019-batman-adv-fix-TT-sync-flag-inconsistencies.patch @@ -0,0 +1,209 @@ +From: Linus Lüssing +Date: Thu, 6 Jul 2017 07:02:25 +0200 +Subject: [PATCH] batman-adv: fix TT sync flag inconsistencies + +This patch fixes an issue in the translation table code potentially +leading to a TT Request + Response storm. The issue may occur for nodes +involving BLA and an inconsistent configuration of the batman-adv AP +isolation feature. However, since the new multicast optimizations, a +single, malformed packet may lead to a mesh-wide, persistent +Denial-of-Service, too. + +The issue occurs because nodes are currently OR-ing the TT sync flags of +all originators announcing a specific MAC address via the +translation table. When an intermediate node now receives a TT Request +and wants to answer this on behalf of the destination node, then this +intermediate node now responds with an altered flag field and broken +CRC. The next OGM of the real destination will lead to a CRC mismatch +and triggering a TT Request and Response again. + +Furthermore, the OR-ing is currently never undone as long as at least +one originator announcing the according MAC address remains, leading to +the potential persistency of this issue. + +This patch fixes this issue by storing the flags used in the CRC +calculation on a a per TT orig entry basis to be able to respond with +the correct, original flags in an intermediate TT Response for one +thing. And to be able to correctly unset sync flags once all nodes +announcing a sync flag vanish for another. + +Fixes: fa614fd04692 ("batman-adv: fix tt_global_entries flags update") +Signed-off-by: Linus Lüssing +Acked-by: Antonio Quartulli +[sw: typo in commit message] +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/382d020fe3fa528b1f65f8107df8fc023eb8cacb +--- + net/batman-adv/translation-table.c | 60 ++++++++++++++++++++++++++++++++------ + net/batman-adv/types.h | 2 ++ + 2 files changed, 53 insertions(+), 9 deletions(-) + +diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c +index 199da2abe6ab92161ab66faa01fa3d06aeb68c89..a64003b824e0d0b05f0a9e44ccc32ba0cb3018fc 100644 +--- a/net/batman-adv/translation-table.c ++++ b/net/batman-adv/translation-table.c +@@ -1549,9 +1549,41 @@ batadv_tt_global_entry_has_orig(const struct batadv_tt_global_entry *entry, + return found; + } + ++/** ++ * batadv_tt_global_sync_flags - update TT sync flags ++ * @tt_global: the TT global entry to update sync flags in ++ * ++ * Updates the sync flag bits in the tt_global flag attribute with a logical ++ * OR of all sync flags from any of its TT orig entries. ++ */ ++static void ++batadv_tt_global_sync_flags(struct batadv_tt_global_entry *tt_global) ++{ ++ struct batadv_tt_orig_list_entry *orig_entry; ++ const struct hlist_head *head; ++ u16 flags = BATADV_NO_FLAGS; ++ ++ rcu_read_lock(); ++ head = &tt_global->orig_list; ++ hlist_for_each_entry_rcu(orig_entry, head, list) ++ flags |= orig_entry->flags; ++ rcu_read_unlock(); ++ ++ flags |= tt_global->common.flags & (~BATADV_TT_SYNC_MASK); ++ tt_global->common.flags = flags; ++} ++ ++/** ++ * batadv_tt_global_orig_entry_add - add or update a TT orig entry ++ * @tt_global: the TT global entry to add an orig entry in ++ * @orig_node: the originator to add an orig entry for ++ * @ttvn: translation table version number of this changeset ++ * @flags: TT sync flags ++ */ + static void + batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global, +- struct batadv_orig_node *orig_node, int ttvn) ++ struct batadv_orig_node *orig_node, int ttvn, ++ u8 flags) + { + struct batadv_tt_orig_list_entry *orig_entry; + +@@ -1561,7 +1593,8 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global, + * was added during a "temporary client detection" + */ + orig_entry->ttvn = ttvn; +- goto out; ++ orig_entry->flags = flags; ++ goto sync_flags; + } + + orig_entry = kmem_cache_zalloc(batadv_tt_orig_cache, GFP_ATOMIC); +@@ -1573,6 +1606,7 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global, + batadv_tt_global_size_inc(orig_node, tt_global->common.vid); + orig_entry->orig_node = orig_node; + orig_entry->ttvn = ttvn; ++ orig_entry->flags = flags; + kref_init(&orig_entry->refcount); + + spin_lock_bh(&tt_global->list_lock); +@@ -1582,6 +1616,8 @@ batadv_tt_global_orig_entry_add(struct batadv_tt_global_entry *tt_global, + spin_unlock_bh(&tt_global->list_lock); + atomic_inc(&tt_global->orig_list_count); + ++sync_flags: ++ batadv_tt_global_sync_flags(tt_global); + out: + if (orig_entry) + batadv_tt_orig_list_entry_put(orig_entry); +@@ -1703,10 +1739,10 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, + } + + /* the change can carry possible "attribute" flags like the +- * TT_CLIENT_WIFI, therefore they have to be copied in the ++ * TT_CLIENT_TEMP, therefore they have to be copied in the + * client entry + */ +- common->flags |= flags; ++ 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 +@@ -1723,7 +1759,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, + } + add_orig_entry: + /* add the new orig_entry (if needed) or update it */ +- batadv_tt_global_orig_entry_add(tt_global_entry, orig_node, ttvn); ++ batadv_tt_global_orig_entry_add(tt_global_entry, orig_node, ttvn, ++ flags & BATADV_TT_SYNC_MASK); + + batadv_dbg(BATADV_DBG_TT, bat_priv, + "Creating new global tt entry: %pM (vid: %d, via %pM)\n", +@@ -1946,6 +1983,7 @@ batadv_tt_global_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq, + struct batadv_tt_orig_list_entry *orig, + bool best) + { ++ u16 flags = (common->flags & (~BATADV_TT_SYNC_MASK)) | orig->flags; + void *hdr; + struct batadv_orig_node_vlan *vlan; + u8 last_ttvn; +@@ -1975,7 +2013,7 @@ batadv_tt_global_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq, + nla_put_u8(msg, BATADV_ATTR_TT_LAST_TTVN, last_ttvn) || + nla_put_u32(msg, BATADV_ATTR_TT_CRC32, crc) || + nla_put_u16(msg, BATADV_ATTR_TT_VID, common->vid) || +- nla_put_u32(msg, BATADV_ATTR_TT_FLAGS, common->flags)) ++ nla_put_u32(msg, BATADV_ATTR_TT_FLAGS, flags)) + goto nla_put_failure; + + if (best && nla_put_flag(msg, BATADV_ATTR_FLAG_BEST)) +@@ -2589,6 +2627,7 @@ static u32 batadv_tt_global_crc(struct batadv_priv *bat_priv, + unsigned short vid) + { + struct batadv_hashtable *hash = bat_priv->tt.global_hash; ++ struct batadv_tt_orig_list_entry *tt_orig; + struct batadv_tt_common_entry *tt_common; + struct batadv_tt_global_entry *tt_global; + struct hlist_head *head; +@@ -2627,8 +2666,9 @@ static u32 batadv_tt_global_crc(struct batadv_priv *bat_priv, + /* find out if this global entry is announced by this + * originator + */ +- if (!batadv_tt_global_entry_has_orig(tt_global, +- orig_node)) ++ tt_orig = batadv_tt_global_orig_entry_find(tt_global, ++ orig_node); ++ if (!tt_orig) + continue; + + /* use network order to read the VID: this ensures that +@@ -2640,10 +2680,12 @@ static u32 batadv_tt_global_crc(struct batadv_priv *bat_priv, + /* compute the CRC on flags that have to be kept in sync + * among nodes + */ +- flags = tt_common->flags & BATADV_TT_SYNC_MASK; ++ flags = tt_orig->flags; + crc_tmp = crc32c(crc_tmp, &flags, sizeof(flags)); + + crc ^= crc32c(crc_tmp, tt_common->addr, ETH_ALEN); ++ ++ batadv_tt_orig_list_entry_put(tt_orig); + } + rcu_read_unlock(); + } +diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h +index 5137d859694c28f60cad33325127617c047412ff..7c928938b22dcae681294700252c0ae74378f999 100644 +--- a/net/batman-adv/types.h ++++ b/net/batman-adv/types.h +@@ -1262,6 +1262,7 @@ struct batadv_tt_global_entry { + * struct batadv_tt_orig_list_entry - orig node announcing a non-mesh client + * @orig_node: pointer to orig node announcing this non-mesh client + * @ttvn: translation table version number which added the non-mesh client ++ * @flags: per orig entry TT sync flags + * @list: list node for batadv_tt_global_entry::orig_list + * @refcount: number of contexts the object is used + * @rcu: struct used for freeing in an RCU-safe manner +@@ -1269,6 +1270,7 @@ struct batadv_tt_global_entry { + struct batadv_tt_orig_list_entry { + struct batadv_orig_node *orig_node; + u8 ttvn; ++ u8 flags; + struct hlist_node list; + struct kref refcount; + struct rcu_head rcu; diff --git a/batman-adv/patches/0020-batman-adv-Avoid-spurious-warnings-from-bat_v-neigh_.patch b/batman-adv/patches/0020-batman-adv-Avoid-spurious-warnings-from-bat_v-neigh_.patch new file mode 100644 index 0000000..31222a4 --- /dev/null +++ b/batman-adv/patches/0020-batman-adv-Avoid-spurious-warnings-from-bat_v-neigh_.patch @@ -0,0 +1,56 @@ +From: Sven Eckelmann +Date: Mon, 16 Oct 2017 09:48:03 +0200 +Subject: [PATCH] batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation + +The neighbor compare API implementation for B.A.T.M.A.N. V checks whether +the neigh_ifinfo for this neighbor on a specific interface exists. A +warning is printed when it isn't found. + +But it is not called inside a lock which would prevent that this +information is lost right before batadv_neigh_ifinfo_get. It must therefore +be expected that batadv_v_neigh_(cmp|is_sob) might not be able to get the +requested neigh_ifinfo. + +A WARN_ON for such a situation seems not to be appropriate because this +will only flood the kernel logs. The warnings must therefore be removed. + +Signed-off-by: Sven Eckelmann +Acked-by: Antonio Quartulli + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/0dee8aba4702f82197ed3428ede6b3884fdff5ca +--- + net/batman-adv/bat_v.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c +index 2e2471ca84e392faac7fd6537bf137161e27542a..80679f17d40170237ce6ad2d800da96bbef79e37 100644 +--- a/net/batman-adv/bat_v.c ++++ b/net/batman-adv/bat_v.c +@@ -623,11 +623,11 @@ static int batadv_v_neigh_cmp(struct batadv_neigh_node *neigh1, + int ret = 0; + + ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1); +- if (WARN_ON(!ifinfo1)) ++ if (!ifinfo1) + goto err_ifinfo1; + + ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); +- if (WARN_ON(!ifinfo2)) ++ if (!ifinfo2) + goto err_ifinfo2; + + ret = ifinfo1->bat_v.throughput - ifinfo2->bat_v.throughput; +@@ -649,11 +649,11 @@ static bool batadv_v_neigh_is_sob(struct batadv_neigh_node *neigh1, + bool ret = false; + + ifinfo1 = batadv_neigh_ifinfo_get(neigh1, if_outgoing1); +- if (WARN_ON(!ifinfo1)) ++ if (!ifinfo1) + goto err_ifinfo1; + + ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); +- if (WARN_ON(!ifinfo2)) ++ if (!ifinfo2) + goto err_ifinfo2; + + threshold = ifinfo1->bat_v.throughput / 4; diff --git a/batman-adv/patches/0021-batman-adv-Always-initialize-fragment-header-priorit.patch b/batman-adv/patches/0021-batman-adv-Always-initialize-fragment-header-priorit.patch new file mode 100644 index 0000000..943d3a9 --- /dev/null +++ b/batman-adv/patches/0021-batman-adv-Always-initialize-fragment-header-priorit.patch @@ -0,0 +1,30 @@ +From: Sven Eckelmann +Date: Wed, 29 Nov 2017 10:25:02 +0100 +Subject: [PATCH] batman-adv: Always initialize fragment header priority + +The batman-adv unuicast fragment header contains 3 bits for the priority of +the packet. These bits will be initialized when the skb->priority contains +a value between 256 and 263. But otherwise, the uninitialized bits from the +stack will be used. + +Fixes: 4f241fcea704 ("batman-adv: Include frame priority in fragment header") +Signed-off-by: Sven Eckelmann + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e45a75c82feae23a20d2744ccfde03780ccdafc7 +--- + net/batman-adv/fragmentation.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c +index 70e512111528b0345889cea4ffd0ad5d984a4e6a..28f54887c975905d03372ab8ba5274fd82117651 100644 +--- a/net/batman-adv/fragmentation.c ++++ b/net/batman-adv/fragmentation.c +@@ -500,6 +500,8 @@ int batadv_frag_send_packet(struct sk_buff *skb, + */ + if (skb->priority >= 256 && skb->priority <= 263) + frag_header.priority = skb->priority - 256; ++ else ++ frag_header.priority = 0; + + ether_addr_copy(frag_header.orig, primary_if->net_dev->dev_addr); + ether_addr_copy(frag_header.dest, orig_node->orig); diff --git a/batman-adv/patches/0022-batman-adv-Fix-check-of-retrieved-orig_gw-in-batadv_.patch b/batman-adv/patches/0022-batman-adv-Fix-check-of-retrieved-orig_gw-in-batadv_.patch new file mode 100644 index 0000000..e0b8cc8 --- /dev/null +++ b/batman-adv/patches/0022-batman-adv-Fix-check-of-retrieved-orig_gw-in-batadv_.patch @@ -0,0 +1,31 @@ +From: Sven Eckelmann +Date: Wed, 29 Nov 2017 10:50:42 +0100 +Subject: [PATCH] batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible + +The batadv_v_gw_is_eligible function already assumes that orig_node is not +NULL. But batadv_gw_node_get may have failed to find the originator. It +must therefore be checked whether the batadv_gw_node_get failed and not +whether orig_node is NULL to detect this error. + +Fixes: 80b2d47be2c7 ("batman-adv: B.A.T.M.A.N. V - implement GW selection logic") +Signed-off-by: Sven Eckelmann +Acked-by: Antonio Quartulli + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/c7380677d6167f3798d3ea7a4f1a93663f3c7915 +--- + net/batman-adv/bat_v.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c +index 80679f17d40170237ce6ad2d800da96bbef79e37..2f77e112d4cb4db7b1086715a597ef995054fdc1 100644 +--- a/net/batman-adv/bat_v.c ++++ b/net/batman-adv/bat_v.c +@@ -815,7 +815,7 @@ static bool batadv_v_gw_is_eligible(struct batadv_priv *bat_priv, + } + + orig_gw = batadv_gw_node_get(bat_priv, orig_node); +- if (!orig_node) ++ if (!orig_gw) + goto out; + + if (batadv_v_gw_throughput_get(orig_gw, &orig_throughput) < 0) diff --git a/batman-adv/patches/0023-batman-adv-Fix-lock-for-ogm-cnt-access-in-batadv_iv_.patch b/batman-adv/patches/0023-batman-adv-Fix-lock-for-ogm-cnt-access-in-batadv_iv_.patch new file mode 100644 index 0000000..d05e487 --- /dev/null +++ b/batman-adv/patches/0023-batman-adv-Fix-lock-for-ogm-cnt-access-in-batadv_iv_.patch @@ -0,0 +1,42 @@ +From: Sven Eckelmann +Date: Sun, 3 Dec 2017 11:26:45 +0100 +Subject: [PATCH] batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq + +The originator node object orig_neigh_node is used to when accessing the +bcast_own(_sum) and real_packet_count information. The access to them has +to be protected with the spinlock in orig_neigh_node. + +But the function uses the lock in orig_node instead. This is incorrect +because they could be two different originator node objects. + +Fixes: f14416760b62 ("batman-adv: protect bit operations to count OGMs with spinlock") +Signed-off-by: Sven Eckelmann +Signed-off-by: Simon Wunderlich + +Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/9a3b195410e5d2f285cdf0073fef721ff8d9474d +--- + net/batman-adv/bat_iv_ogm.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c +index 7bfd0d7ef49df8e699f91e2b827b824aa3657c0d..56b4984d738e87098c24213d4aa277a2ef948fec 100644 +--- a/net/batman-adv/bat_iv_ogm.c ++++ b/net/batman-adv/bat_iv_ogm.c +@@ -1214,7 +1214,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, + orig_node->last_seen = jiffies; + + /* find packet count of corresponding one hop neighbor */ +- spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); ++ spin_lock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); + if_num = if_incoming->if_num; + orig_eq_count = orig_neigh_node->bat_iv.bcast_own_sum[if_num]; + neigh_ifinfo = batadv_neigh_ifinfo_new(neigh_node, if_outgoing); +@@ -1224,7 +1224,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, + } else { + neigh_rq_count = 0; + } +- spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); ++ spin_unlock_bh(&orig_neigh_node->bat_iv.ogm_cnt_lock); + + /* pay attention to not get a value bigger than 100 % */ + if (orig_eq_count > neigh_rq_count)