commits

commits@lists.open-mesh.org

1 participants
12425 discussions

[batctl] master: batctl: Handle nl_cb_alloc errors (0a14f88)
by postmaster＠open-mesh.org 01 Dec '17

01 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 0a14f8800dac67d706827e9be7745e2319f5412c Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Thu Nov 23 15:04:40 2017 +0100 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 <sven.eckelmann(a)openmesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 0a14f8800dac67d706827e9be7745e2319f5412c netlink.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/netlink.c b/netlink.c index d7aeb9a..b95063a 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;

1 0

[batctl] master: batctl: Handle failure during hash_iterator allocation (aa316bf)
by postmaster＠open-mesh.org 01 Dec '17

01 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit aa316bf6d1b2cf0ab7189ed8620c17f5018d4d37 Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Thu Nov 23 15:04:36 2017 +0100 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 <sven.eckelmann(a)openmesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- aa316bf6d1b2cf0ab7189ed8620c17f5018d4d37 hash.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hash.c b/hash.c index f4a7af7..0e4d1e3 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;

1 0

[batctl] master: batctl: Handle allocation error for path_buff (3b52283)
by postmaster＠open-mesh.org 01 Dec '17

01 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 3b52283a5f60d1c6ec11628d031e72f0a28a720f Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Thu Nov 23 15:04:37 2017 +0100 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 <sven.eckelmann(a)openmesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 3b52283a5f60d1c6ec11628d031e72f0a28a720f sys.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys.c b/sys.c index 65b438c..c49b428 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) { @@ -255,6 +260,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 @@ -329,6 +339,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) {

1 0

[batctl] master: batctl: Print dummy value when localtime failed (09dd2dc)
by postmaster＠open-mesh.org 01 Dec '17

01 Dec '17

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 09dd2dc0b4945c83bd07ad4bce64062239d901fb Author: Sven Eckelmann <sven.eckelmann(a)openmesh.com> Date: Thu Nov 23 15:04:35 2017 +0100 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 <sven.eckelmann(a)openmesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 09dd2dc0b4945c83bd07ad4bce64062239d901fb tcpdump.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tcpdump.c b/tcpdump.c index 4ede76b..5eb99cf 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -104,7 +104,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; }

1 0

[batman-adv] master: batman-adv: Fix kernel-doc for timer functions (258e419d)
by postmaster＠open-mesh.org 01 Dec '17

01 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 258e419d51abddf3ee69c7256e4b349499337e41 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Dec 1 11:47:56 2017 +0100 batman-adv: Fix kernel-doc for timer functions The commit e99e88a9d2b0 ("treewide: setup_timer() -> timer_setup()") changed the argument name and type of the timer function but didn't adjust the kernel-doc of these functions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 258e419d51abddf3ee69c7256e4b349499337e41 net/batman-adv/tp_meter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 15cd2139..ebc4e224 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -482,7 +482,7 @@ static void batadv_tp_reset_sender_timer(struct batadv_tp_vars *tp_vars) /** * batadv_tp_sender_timeout - timer that fires in case of packet loss - * @arg: address of the related tp_vars + * @t: address to timer_list inside tp_vars * * If fired it means that there was packet loss. * Switch to Slow Start, set the ss_threshold to half of the current cwnd and @@ -1106,7 +1106,7 @@ static void batadv_tp_reset_receiver_timer(struct batadv_tp_vars *tp_vars) /** * batadv_tp_receiver_shutdown - stop a tp meter receiver when timeout is * reached without received ack - * @arg: address of the related tp_vars + * @t: address to timer_list inside tp_vars */ static void batadv_tp_receiver_shutdown(struct timer_list *t) {

1 0

[batman-adv] master: batman-adv: setup_timer() -> timer_setup() (295ef829)
by postmaster＠open-mesh.org 01 Dec '17

01 Dec '17

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 295ef829f69bb8b455edcd35f1df5e3ac70ad05a Author: Kees Cook <keescook(a)chromium.org> Date: Fri Dec 1 11:47:55 2017 +0100 batman-adv: setup_timer() -> timer_setup() This converts all remaining cases of the old setup_timer() API into using timer_setup(), where the callback argument is the structure already holding the struct timer_list. These should have no behavioral changes, since they just change which pointer is passed into the callback with the same available pointers after conversion. Signed-off-by: Kees Cook <keescook(a)chromium.org> [sven(a)narfation.org: removed spatch and examples, added compat code] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 295ef829f69bb8b455edcd35f1df5e3ac70ad05a compat-include/linux/timer.h | 59 ++++++++++++++++++++++++++++++++++++++++++++ net/batman-adv/tp_meter.c | 14 +++++------ 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/compat-include/linux/timer.h b/compat-include/linux/timer.h new file mode 100644 index 00000000..750b6ae6 --- /dev/null +++ b/compat-include/linux/timer.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2017 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + * + * License-Filename: LICENSES/preferred/GPL-2.0 + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_TIMER_H +#define _NET_BATMAN_ADV_COMPAT_LINUX_TIMER_H + +#include <linux/version.h> +#include_next <linux/timer.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) + +#define __setup_timer(_timer, _fn, _data, _flags) \ + do { \ + init_timer(_timer); \ + (_timer)->function = (_fn); \ + (_timer)->data = (_data); \ + } while (0) + +#endif /* < KERNEL_VERSION(3, 7, 0) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + +#define TIMER_DATA_TYPE unsigned long +#define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE) + +static inline void timer_setup(struct timer_list *timer, + void (*callback)(struct timer_list *), + unsigned int flags) +{ + __setup_timer(timer, (TIMER_FUNC_TYPE)callback, + (TIMER_DATA_TYPE)timer, flags); +} + +#define from_timer(var, callback_timer, timer_fieldname) \ + container_of(callback_timer, typeof(*var), timer_fieldname) + +#endif /* < KERNEL_VERSION(4, 14, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TIMER_H */ diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index 4b90033f..15cd2139 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -488,9 +488,9 @@ static void batadv_tp_reset_sender_timer(struct batadv_tp_vars *tp_vars) * Switch to Slow Start, set the ss_threshold to half of the current cwnd and * reset the cwnd to 3*MSS */ -static void batadv_tp_sender_timeout(unsigned long arg) +static void batadv_tp_sender_timeout(struct timer_list *t) { - struct batadv_tp_vars *tp_vars = (struct batadv_tp_vars *)arg; + struct batadv_tp_vars *tp_vars = from_timer(tp_vars, t, timer); struct batadv_priv *bat_priv = tp_vars->bat_priv; if (atomic_read(&tp_vars->sending) == 0) @@ -1020,8 +1020,7 @@ void batadv_tp_start(struct batadv_priv *bat_priv, const u8 *dst, atomic64_set(&tp_vars->tot_sent, 0); kref_get(&tp_vars->refcount); - setup_timer(&tp_vars->timer, batadv_tp_sender_timeout, - (unsigned long)tp_vars); + timer_setup(&tp_vars->timer, batadv_tp_sender_timeout, 0); tp_vars->bat_priv = bat_priv; tp_vars->start_time = jiffies; @@ -1109,9 +1108,9 @@ static void batadv_tp_reset_receiver_timer(struct batadv_tp_vars *tp_vars) * reached without received ack * @arg: address of the related tp_vars */ -static void batadv_tp_receiver_shutdown(unsigned long arg) +static void batadv_tp_receiver_shutdown(struct timer_list *t) { - struct batadv_tp_vars *tp_vars = (struct batadv_tp_vars *)arg; + struct batadv_tp_vars *tp_vars = from_timer(tp_vars, t, timer); struct batadv_tp_unacked *un, *safe; struct batadv_priv *bat_priv; @@ -1373,8 +1372,7 @@ batadv_tp_init_recv(struct batadv_priv *bat_priv, hlist_add_head_rcu(&tp_vars->list, &bat_priv->tp_list); kref_get(&tp_vars->refcount); - setup_timer(&tp_vars->timer, batadv_tp_receiver_shutdown, - (unsigned long)tp_vars); + timer_setup(&tp_vars->timer, batadv_tp_receiver_shutdown, 0); batadv_tp_reset_receiver_timer(tp_vars);

1 0

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

27 Nov '17

The annotated tag, v4.15-rc1 has been created at 2fd4bf77c3d8ccceaf6bdaa507ee4cf94e1a2ca5 (tag) tagging 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 (commit) replaces v4.14 tagged by Linus Torvalds on Sun Nov 26 16:01:57 2017 -0800 - Shortlog ------------------------------------------------------------ Linux 4.15-rc1 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaG1X1AAoJEHm+PkMAQRiGLcMH/iZ0K7obuuqVZCs1j0EeBTHB WTy+uhIND+7Zrdz+UXM9xcisyzSHKbrIqOzXygXNqoYPGqqQF+o2grw8xoSftxPG /Pashmda3gF+GTxpNJ5ZXjNoGlWJ/egiZZKTilJ1oBHAgSpTvK/e9KGY0zgimOEy KAQUYzydtxKrXl72/ybX64FiJNmTu13PFD5uWvMsxfQstbyLhPU8B2XgoNSSe2TA lxYPIt5P3X+5EjfdrhmEYqANjqyHp2cWBOGkocqyfYbXlJKfhmNu/Ar61yz21LXd M+vk7vkEZ7QWaHjtPS4M3noBqu3PIy6JPxYgZ+huBIxlK0BF5RSwSTfVMfrV4y0= =cZ6Z -----END PGP SIGNATURE----- David Ahern (2): net: Add extack to ndo_add_slave net: Add extack to upper device linking David S. Miller (1): Merge tag 'batadv-next-for-davem-20171006' of git://git.open-mesh.org/linux-merge Gao Feng (1): net: Remove useless function skb_header_release Kees Cook (1): treewide: setup_timer() -> timer_setup() Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (5): batman-adv: Remove unnecessary parentheses batman-adv: Fix "line over 80 characters" checkpatch warning batman-adv: Add argument names for function ptr definitions batman-adv: Add missing kerneldoc for extack batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation ----------------------------------------------------------------------- -- linux integration

1 0

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

12 Nov '17

The annotated tag, v4.14 has been created at e3d97e8db5c45dfe3e4c70252acc5f4edea172b7 (tag) tagging bebc6082da0a9f5d47a1ea2edc099bf671058bd4 (commit) replaces v4.14-rc8 tagged by Linus Torvalds on Sun Nov 12 10:46:21 2017 -0800 - Shortlog ------------------------------------------------------------ Linux 4.14 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJaCJb+AAoJEHm+PkMAQRiGGZEIAJvmVi/nMB3KLPryyNBAlvWC tBy7jxgl3LEUqT1QgRTKsfQtURfiH9BEmN8oM+WG2TkbAS9zMFoVVKUPpzZyb00J qSk/voSUiH46kCQfQlbM4Del4iHjngiJRDUQguRnaXzK1+LsAvIMNOLiA/z+auKB XZLRmt4t2PB1xkUmjumI16MYfkPRs0Y85bIWE5fATK02ci3daY1VtSvEHhvz5sHO 69TzUdk8EWrdnuWxJ+zQ+1EzYVHMh/h1mNNlywRbpGvq8GumBRpZGnb7KyHTkh3y Q4HLB8yaFxEwTTOWm5+bczY91KbWVZ6e4DKHSz4ka1fwFg0MFKLRvhRvakJy1jE= =aB7O -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] ecsv/master, master: alfred: Keep length unsigned when processing packets (d4cd6f3)
by postmaster＠open-mesh.org 12 Nov '17

12 Nov '17

Repository : ssh://git@open-mesh.org/alfred On branches: ecsv/master,master >--------------------------------------------------------------- commit d4cd6f3ec244ff257c21d40eb5312adce5206989 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 24 10:05:52 2017 +0200 alfred: Keep length unsigned when processing packets The header.length field is unsigned (network byte order). The converted datatype should therefore also be unsigned. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- d4cd6f3ec244ff257c21d40eb5312adce5206989 recv.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/recv.c b/recv.c index 83fbff9..ebc3041 100644 --- a/recv.c +++ b/recv.c @@ -41,22 +41,26 @@ static int finish_alfred_push_data(struct globals *globals, struct ether_addr mac, struct alfred_push_data_v0 *push) { - int len, data_len; + unsigned int len, data_len; bool new_entry_created; struct alfred_data *data; struct dataset *dataset; uint8_t *pos; + /* test already done in process_alfred_push_data */ len = ntohs(push->header.length); + if (len < sizeof(*push) - sizeof(push->header)) + return -1; + len -= sizeof(*push) - sizeof(push->header); pos = (uint8_t *)push->data; - while (len >= (int)sizeof(*data)) { + while (len >= sizeof(*data)) { data = (struct alfred_data *)pos; data_len = ntohs(data->header.length); /* check if enough data is available */ - if ((int)(data_len + sizeof(*data)) > len) + if (data_len + sizeof(*data) > len) break; new_entry_created = false; @@ -194,7 +198,7 @@ static int process_alfred_push_data(struct globals *globals, alfred_addr *source, struct alfred_push_data_v0 *push) { - int len; + unsigned int len; struct ether_addr mac; int ret; struct transaction_head search, *head; @@ -209,7 +213,7 @@ static int process_alfred_push_data(struct globals *globals, goto err; len = ntohs(push->header.length); - if (len < (int)(sizeof(*push) - sizeof(push->header))) + if (len < sizeof(*push) - sizeof(push->header)) goto err; search.server_addr = mac; @@ -310,7 +314,7 @@ static int process_alfred_request(struct globals *globals, alfred_addr *source, struct alfred_request_v0 *request) { - int len; + unsigned int len; len = ntohs(request->header.length); @@ -333,7 +337,8 @@ static int process_alfred_status_txend(struct globals *globals, { struct transaction_head search, *head; struct ether_addr mac; - int len, ret; + unsigned int len; + int ret; len = ntohs(request->header.length);

1 0

[alfred] ecsv/master, master: alfred: Remove announce length validation (0c8f710)
by postmaster＠open-mesh.org 12 Nov '17

12 Nov '17

Repository : ssh://git@open-mesh.org/alfred On branches: ecsv/master,master >--------------------------------------------------------------- commit 0c8f7107ce339e34131eee57041e94d6ef985b64 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 24 10:04:07 2017 +0200 alfred: Remove announce length validation The announce message has no extra fields. The check whether the header.length field is >= 0 will therefore always be true because header.length is an unsigned short. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0c8f7107ce339e34131eee57041e94d6ef985b64 alfred.h | 2 ++ recv.c | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/alfred.h b/alfred.h index 460f52f..f52e66b 100644 --- a/alfred.h +++ b/alfred.h @@ -147,6 +147,8 @@ struct globals { #define debugMalloc(size, num) malloc(size) #define debugFree(ptr, num) free(ptr) +#define BUILD_BUG_ON(e) ((void)sizeof(char[1 - 2 * !!(e)])) + #define MAX_PAYLOAD ((1 << 16) - 1 - sizeof(struct udphdr)) extern alfred_addr alfred_mcast; diff --git a/recv.c b/recv.c index e897e3d..83fbff9 100644 --- a/recv.c +++ b/recv.c @@ -270,9 +270,6 @@ process_alfred_announce_master(struct globals *globals, struct server *server; struct ether_addr mac; int ret; - int len; - - len = ntohs(announce->header.length); if (globals->ipv4mode) ret = ipv4_to_mac(interface, source, &mac); @@ -284,8 +281,8 @@ process_alfred_announce_master(struct globals *globals, if (announce->header.version != ALFRED_VERSION) return -1; - if (len < (sizeof(*announce) - sizeof(announce->header))) - return -1; + /* skip header.length check because "announce" has no extra fields */ + BUILD_BUG_ON(sizeof(*announce) - sizeof(announce->header) != 0); server = hash_find(interface->server_hash, &mac); if (!server) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits