commits March 2015

commits@lists.open-mesh.org

1 participants
35 discussions

[openwrt-feed-alfred] master: alfred: bump to latest trunk version (3994128)
by postmaster＠open-mesh.org 11 Mar '15

11 Mar '15

Repository : ssh://git@open-mesh.org/openwrt-feed-alfred On branch : master >--------------------------------------------------------------- commit 3994128f76a3df3b27add30c52ceb055aa876452 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Mar 11 13:11:15 2015 +0100 alfred: bump to latest trunk version New features and fixes: * add debug option * add libcap capability to drop priveleges (currently disabled by default due to dependency on libcap) * fixes: size check, close socket after connection failure, update version Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 3994128f76a3df3b27add30c52ceb055aa876452 alfred/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index b2129af..f79b4c1 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -13,7 +13,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred PKG_VERSION:=2014.4.0 PKG_RELEASE:=0 -PKG_REV:=03108de2b0f9a5f447efe45d0ad332fe40f7943e +PKG_REV:=b8210c0a1f0d2a130212a274ab1e89d0bd105245 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz PKG_SOURCE_URL:=git://git.open-mesh.org/alfred.git @@ -45,7 +45,8 @@ endef MAKE_ALFRED_FLAGS=\ CONFIG_ALFRED_VIS=$(if $(CONFIG_PACKAGE_ALFRED_VIS),y,n) \ - CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) + CONFIG_ALFRED_GPSD=$(if $(CONFIG_PACKAGE_ALFRED_GPSD),y,n) \ + CONFIG_ALFRED_CAPABILITIES=n TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin

1 0

[alfred] master: alfred: Add option to the client to print extra data information (b8210c0)
by postmaster＠open-mesh.org 11 Mar '15

11 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit b8210c0a1f0d2a130212a274ab1e89d0bd105245 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 7 23:45:53 2015 +0100 alfred: Add option to the client to print extra data information The version of a dataset can be queried using the parameter --verbose/-d. It is printed as third component of each dataset line when starting the unix client in request mode. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- b8210c0a1f0d2a130212a274ab1e89d0bd105245 alfred.h | 1 + client.c | 7 ++++++- main.c | 8 +++++++- man/alfred.8 | 3 +++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/alfred.h b/alfred.h index ef00551..f26c80c 100644 --- a/alfred.h +++ b/alfred.h @@ -113,6 +113,7 @@ struct globals { enum clientmode clientmode; int clientmode_arg; int clientmode_version; + int verbose; int unix_sock; const char *unix_path; diff --git a/client.c b/client.c index 32fdd54..42dd4ad 100644 --- a/client.c +++ b/client.c @@ -121,7 +121,12 @@ int alfred_client_request_data(struct globals *globals) printf("%c", pos[i]); } - printf("\" },\n"); + printf("\""); + + if (globals->verbose) + printf(", %u", data->header.version); + + printf(" },\n"); } unix_sock_close(globals); diff --git a/main.c b/main.c index 982bd2a..e9821be 100644 --- a/main.c +++ b/main.c @@ -43,6 +43,7 @@ static void alfred_usage(void) printf(" for the supplied data type (0-255)\n"); printf(" -r, --request [data type] collect data from the network and prints\n"); printf(" it on the network\n"); + printf(" -d, --verbose Show extra information in the data output\n"); printf(" -V, --req-version specify the data version set for -s\n"); printf(" -M, --modeswitch master switch daemon to mode master\n"); printf(" slave switch daemon to mode slave\n"); @@ -153,6 +154,7 @@ static struct globals *alfred_init(int argc, char *argv[]) {"change-interface", required_argument, NULL, 'I'}, {"unix-path", required_argument, NULL, 'u'}, {"version", no_argument, NULL, 'v'}, + {"verbose", no_argument, NULL, 'd'}, {NULL, 0, NULL, 0}, }; @@ -171,10 +173,11 @@ static struct globals *alfred_init(int argc, char *argv[]) globals->clientmode_version = 0; globals->mesh_iface = "bat0"; globals->unix_path = ALFRED_SOCK_PATH_DEFAULT; + globals->verbose = 0; time_random_seed(); - while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:d", long_options, &opt_ind)) != -1) { switch (opt) { case 'r': @@ -231,6 +234,9 @@ static struct globals *alfred_init(int argc, char *argv[]) case 'u': globals->unix_path = optarg; break; + case 'd': + globals->verbose++; + break; case 'v': printf("%s %s\n", argv[0], SOURCE_VERSION); printf("A.L.F.R.E.D. - Almighty Lightweight Remote Fact Exchange Daemon\n"); diff --git a/man/alfred.8 b/man/alfred.8 index 0449189..a8050ab 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -67,6 +67,9 @@ alfred will forget about it (after 10 minutes). \fB\-r\fP, \fB\-\-request\fP \fIdata\-type\fP Collect data from the network and prints it on the network .TP +\fB\-d\fP, \fB\-\-verbose\fP +Show extra information in the data output +.TP \fB\-V\fP, \fB\-\-req\-version\fP \fIversion\fP Specify the data version set for \fB\-s\fP

1 0

[alfred] master: alfred: Add explanation how to run alfred as non-root user (be4d727)
by postmaster＠open-mesh.org 11 Mar '15

11 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit be4d7277471cd361c5760bb375163ba1e34d4978 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Mar 5 09:12:31 2015 +0100 alfred: Add explanation how to run alfred as non-root user Reported-by: MK <mailing.m1(a)kkk-web.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- be4d7277471cd361c5760bb375163ba1e34d4978 README | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/README b/README index 90a99de..2bb4f9b 100644 --- a/README +++ b/README @@ -256,6 +256,32 @@ To get JSON formatted output, use: See gpsd_json(5) for documentation of the tpv object. +Running alfred as non-root user +------------------------------- + +Alfred currently requires special capabilities and access rights to work +correctly. The user root is normally the only user having these +capabilities/rights on a standard Linux system. + +Operations requiring special capabilities: + + * bind to device + * creating the unix socket + * accessing the debugfs filesystem + +The first operation can still be executed when the admin grants the special +capability CAP_NET_RAW to anyone executing the alfred binary. The unix socket +can also be moved using the parameter '-u' to a different directory which can +be accessed by the user. + + $ sudo setcap cap_net_raw+ep alfred + $ ./alfred -u alfred.sock -i eth0 + +The user running alfred must still be in a group which is allowed to access +/sys/kernel/debugfs to correctly choose best neighbors for communication. +It is possible (but not recommended) to disable the neighbor +selection/prioritization using the parameter '-b none'. + License -------

1 0

[alfred] master: alfred: Update version when adding data to dataset (17d1102)
by postmaster＠open-mesh.org 11 Mar '15

11 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 17d1102c817dffa9611c018911ce6ce890df2039 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Mar 7 23:41:17 2015 +0100 alfred: Update version when adding data to dataset The dataset stores the source and the alfred_tlv of the send data next to the actual data buffer. The source and alfred_tlv::type was used to find an entry in the dataset hashtable when reading/updating the buffer. The alfred_tlv::length is always updated when the size of the associated buffer gets modified. But the alfred_tlv::version is only written when receiving the first data for a dataset. But this initial (maybe outdated) version is always propagated when a client asks over the unix socket or the dataset is exchanged between alfred servers. This has to also be updated when new data is added to the dataset to avoid clients to interpret the data using the wrong data format version. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 17d1102c817dffa9611c018911ce6ce890df2039 recv.c | 1 + unix_sock.c | 1 + 2 files changed, 2 insertions(+) diff --git a/recv.c b/recv.c index 34a16fc..e0252eb 100644 --- a/recv.c +++ b/recv.c @@ -91,6 +91,7 @@ static int finish_alfred_push_data(struct globals *globals, goto err; dataset->data.header.length = data_len; + dataset->data.header.version = data->header.version; memcpy(dataset->buf, data->data, data_len); /* if the sender is also the the source of the dataset, we diff --git a/unix_sock.c b/unix_sock.c index ae86956..0707252 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -151,6 +151,7 @@ static int unix_sock_add_data(struct globals *globals, goto err; dataset->data.header.length = data_len; + dataset->data.header.version = data->header.version; memcpy(dataset->buf, data->data, data_len); ret = 0;

1 0

[alfred] master: alfred: Drop capabilities when not needed (b0877b3)
by postmaster＠open-mesh.org 11 Mar '15

11 Mar '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit b0877b387ba13da3e0f342e2c59768c32666a5b6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 23 20:18:50 2015 +0100 alfred: Drop capabilities when not needed The alfred process only requires the capability to bind to a raw socket (CAP_NET_RAW). It is enough to mark this capability as permitted on program startup and mark it again as effective whenever a new netsock is initialized. All other capabilities can be dropped completely. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> [sw: fixed Makefile comment] Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- b0877b387ba13da3e0f342e2c59768c32666a5b6 Makefile | 24 ++++++++++++++++++ main.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- netsock.c | 44 ++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8e944c9..818b1fd 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,9 @@ MANPAGE = man/alfred.8 CFLAGS += -pedantic -Wall -W -std=gnu99 -fno-strict-aliasing -MD -MP LDLIBS += -lrt +# Turn on alfred capability dropping by default - set this to n if you don't want/need it +export CONFIG_ALFRED_CAPABILITIES=y + # disable verbose output ifneq ($(findstring $(MAKEFLAGS),s),s) ifndef V @@ -70,6 +73,27 @@ ifneq ($(CONFIG_ALFRED_GPSD),n) GPSD_INSTALL=gpsd-install endif +ifneq ($(CONFIG_ALFRED_CAPABILITIES),n) + ifeq ($(origin PKG_CONFIG), undefined) + PKG_CONFIG = pkg-config + ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null),) + $(error $(PKG_CONFIG) not found) + endif + endif + + ifeq ($(origin LIBCAP_CFLAGS) $(origin LIBCAP_LDLIBS), undefined undefined) + LIBCAP_NAME ?= libcap + ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBCAP_NAME) 2>/dev/null),) + $(error No $(LIBCAP_NAME) development libraries found!) + endif + LIBCAP_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(LIBCAP_NAME)) + LIBCAP_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBCAP_NAME)) + endif + CFLAGS += $(LIBCAP_CFLAGS) + CPPFLAGS += -DCONFIG_ALFRED_CAPABILITIES + LDLIBS += $(LIBCAP_LDLIBS) +endif + # default target all: $(BINARY_NAME) $(VIS_ALL) $(GPSD_ALL) diff --git a/main.c b/main.c index d298d65..982bd2a 100644 --- a/main.c +++ b/main.c @@ -24,6 +24,11 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifdef CONFIG_ALFRED_CAPABILITIES +#include <sys/prctl.h> +#include <sys/capability.h> +#include <unistd.h> +#endif #include "alfred.h" #include "packet.h" #include "list.h" @@ -60,9 +65,82 @@ static void alfred_usage(void) printf("\n"); } +static int reduce_capabilities(void) +{ + int ret = 0; + +#ifdef CONFIG_ALFRED_CAPABILITIES + cap_t cap_cur; + cap_t cap_new; + cap_flag_value_t cap_flag; + cap_value_t cap_net_raw = CAP_NET_RAW; + + /* get current process capabilities */ + cap_cur = cap_get_proc(); + if (!cap_cur) { + perror("cap_get_proc"); + return -1; + } + + /* create new capabilities */ + cap_new = cap_init(); + if (!cap_new) { + perror("cap_init"); + cap_free(cap_new); + return -1; + } + + /* copy capability as non-effictive but permitted */ + cap_flag = CAP_CLEAR; + cap_get_flag(cap_cur, CAP_NET_RAW, CAP_PERMITTED, &cap_flag); + if (cap_flag != CAP_CLEAR) { + ret = cap_set_flag(cap_new, CAP_PERMITTED, 1, &cap_net_raw, + CAP_SET); + if (ret < 0) { + perror("cap_set_flag"); + goto out; + } + } + + /* set minimal capabilities field */ + ret = cap_set_proc(cap_new); + if (ret < 0) { + perror("cap_set_proc"); + goto out; + } + + /* don't drop capabilities with setuid */ + ret = prctl(PR_SET_KEEPCAPS, 1); + if (ret < 0) { + perror("prctl PR_SET_KEEPCAPS(1)"); + goto out; + } + + /* drop euid */ + ret = setuid(getuid()); + if (ret < 0) { + perror("setuid"); + goto out; + } + + /* drop capabilities with setuid */ + ret = prctl(PR_SET_KEEPCAPS, 0); + if (ret < 0) { + perror("prctl PR_SET_KEEPCAPS(0)"); + goto out; + } + +out: + cap_free(cap_new); + cap_free(cap_cur); +#endif + + return ret; +} + static struct globals *alfred_init(int argc, char *argv[]) { - int opt, opt_ind, i; + int opt, opt_ind, i, ret; struct globals *globals; struct option long_options[] = { {"set-data", required_argument, NULL, 's'}, @@ -78,6 +156,10 @@ static struct globals *alfred_init(int argc, char *argv[]) {NULL, 0, NULL, 0}, }; + ret = reduce_capabilities(); + if (ret < 0) + return NULL; + globals = &alfred_globals; memset(globals, 0, sizeof(*globals)); diff --git a/netsock.c b/netsock.c index cc2e9a5..592f3e3 100644 --- a/netsock.c +++ b/netsock.c @@ -34,6 +34,9 @@ #include <sys/types.h> #include <stdlib.h> #include <sys/select.h> +#ifdef CONFIG_ALFRED_CAPABILITIES +#include <sys/capability.h> +#endif #include "alfred.h" #include "batadv_query.h" #include "packet.h" @@ -165,6 +168,45 @@ int netsock_set_interfaces(struct globals *globals, char *interfaces) return 0; } +static int enable_raw_bind_capability(int enable) +{ + int ret = 0; + +#ifdef CONFIG_ALFRED_CAPABILITIES + cap_t cap_cur; + cap_flag_value_t cap_flag; + cap_value_t cap_net_raw = CAP_NET_RAW; + + if (enable) + cap_flag = CAP_SET; + else + cap_flag = CAP_CLEAR; + + cap_cur = cap_get_proc(); + if (!cap_cur) { + perror("cap_get_proc"); + return -1; + } + + ret = cap_set_flag(cap_cur, CAP_EFFECTIVE, 1, &cap_net_raw, cap_flag); + if (ret < 0) { + perror("cap_set_flag"); + goto out; + } + + ret = cap_set_proc(cap_cur); + if (ret < 0) { + perror("cap_set_proc"); + goto out; + } + +out: + cap_free(cap_cur); +#endif + + return ret; +} + static int netsock_open(struct interface *interface) { int sock; @@ -204,11 +246,13 @@ static int netsock_open(struct interface *interface) memcpy(&interface->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); mac_to_ipv6(&interface->hwaddr, &interface->address); + enable_raw_bind_capability(1); if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, interface->interface, strlen(interface->interface) + 1)) { perror("can't bind to device"); goto err; } + enable_raw_bind_capability(0); if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { perror("can't bind");

1 0

[batman-adv] master: batman-adv: main, batadv_compare_eth return bool (16af734)
by postmaster＠open-mesh.org 11 Mar '15

11 Mar '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 16af73458acad5a6c5350ec337268cbe7c00d789 Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:39 2014 +0100 batman-adv: main, batadv_compare_eth return bool Declare the returntype of batadv_compare_eth as bool. The function called inside this helper function (ether_addr_equal_unaligned) also uses bool as return value, so there is no need to return int. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 16af73458acad5a6c5350ec337268cbe7c00d789 main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index c06482c..569846b 100644 --- a/main.h +++ b/main.h @@ -281,7 +281,7 @@ static inline void _batadv_dbg(int type __always_unused, * * note: can't use ether_addr_equal() as it requires aligned memory */ -static inline int batadv_compare_eth(const void *data1, const void *data2) +static inline bool batadv_compare_eth(const void *data1, const void *data2) { return ether_addr_equal_unaligned(data1, data2); }

1 0

[batman-adv] master: batman-adv: main, Convert is_my_mac() to bool (a5b709e)
by postmaster＠open-mesh.org 11 Mar '15

11 Mar '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a5b709ec61ec0a405df151fb2bf47e8dae04c8ab Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:38 2014 +0100 batman-adv: main, Convert is_my_mac() to bool It is much clearer to see a bool type as return value than 'int' for functions that are supposed to return true or false. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- a5b709ec61ec0a405df151fb2bf47e8dae04c8ab main.c | 11 +++++++---- main.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index a36cd71..bb9a1d6 100644 --- a/main.c +++ b/main.c @@ -209,10 +209,13 @@ void batadv_mesh_free(struct net_device *soft_iface) * interfaces in the current mesh * @bat_priv: the bat priv with all the soft interface information * @addr: the address to check + * + * Returns 'true' if the mac address was found, false otherwise. */ -int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr) +bool batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr) { const struct batadv_hard_iface *hard_iface; + bool is_my_mac = false; rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { @@ -223,12 +226,12 @@ int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr) continue; if (batadv_compare_eth(hard_iface->net_dev->dev_addr, addr)) { - rcu_read_unlock(); - return 1; + is_my_mac = true; + break; } } rcu_read_unlock(); - return 0; + return is_my_mac; } /** diff --git a/main.h b/main.h index 4deacfd..c06482c 100644 --- a/main.h +++ b/main.h @@ -197,7 +197,7 @@ extern struct workqueue_struct *batadv_event_workqueue; int batadv_mesh_init(struct net_device *soft_iface); void batadv_mesh_free(struct net_device *soft_iface); -int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr); +bool batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr); struct batadv_hard_iface * batadv_seq_print_text_primary_if_get(struct seq_file *seq); int batadv_max_header_len(void);

1 0

[linux-merge]linux integration; annotated tag, v4.0-rc3, created. v4.0-rc3
by postmaster＠open-mesh.org 09 Mar '15

09 Mar '15

The annotated tag, v4.0-rc3 has been created at 4288c7642bbc65e806cba72ea7d6fe3d210e381e (tag) tagging 9eccca0843205f87c00404b663188b88eb248051 (commit) replaces v4.0-rc2 tagged by Linus Torvalds on Sun Mar 8 16:09:16 2015 -0700 - Shortlog ------------------------------------------------------------ Linux 4.0-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJU/NacAAoJEHm+PkMAQRiGdUcIAJU5dHclwd9HRc7LX5iOwYN6 mN0aCsYjMD8Pjx2VcPCgJvkIoESQO5pkwYpFFWCwILup1bVEidqXfr8EPOdThzdh kcaT0FwUvd19K+0jcKVNCX1RjKBtlUfUKONk6sS2x4RrYZpv0Ur8Gh+yXV8iMWtf fAusNEYlxQJvEz5+NSKw86EZTr4VVcykKLNvj+/t/JrXEuue7IG8EyoAO/nLmNd2 V/TUKKttqpE6aUVBiBDmcMQl2SUVAfp5e+KJAHmizdDpSE80nU59UC1uyV8VCYdM qwHXgttLhhKr8jBPOkvUxl4aSXW7S0QWO8TrMpNdEOeB3ZB8AKsiIuhe1JrK0ro= =Xkue -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Remove unnecessary check for orig_ifinfo not NULL (8435e41)
by postmaster＠open-mesh.org 09 Mar '15

09 Mar '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 8435e41ee1e2ad9189d4a966b94e0e3af58bf418 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 1 16:56:26 2015 +0100 batman-adv: Remove unnecessary check for orig_ifinfo not NULL orig_ifinfo is dereferenced multiple times in batadv_iv_ogm_update_seqnos before the check for NULL is done. The function also exists at the beginning when orig_ifinfo would have been NULL. This makes the check at the end unnecessary and only confuses the reader/code analyzers. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 8435e41ee1e2ad9189d4a966b94e0e3af58bf418 bat_iv_ogm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 554e0e0..04bd220 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1357,8 +1357,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, out: spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); batadv_orig_node_free_ref(orig_node); - if (orig_ifinfo) - batadv_orig_ifinfo_free_ref(orig_ifinfo); + batadv_orig_ifinfo_free_ref(orig_ifinfo); return ret; }

1 0

[batman-adv] master: batman-adv: types, Fix comment on bcast_own (eb923e9)
by postmaster＠open-mesh.org 09 Mar '15

09 Mar '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit eb923e94eb2668f584227d1032308415f289f87c Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:37 2014 +0100 batman-adv: types, Fix comment on bcast_own batadv_orig_bat_iv->bcast_own is actually not a bitfield, it is an array. Adjust the comment accordingly. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- eb923e94eb2668f584227d1032308415f289f87c types.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/types.h b/types.h index 3b096c4..b72fa7b 100644 --- a/types.h +++ b/types.h @@ -183,9 +183,10 @@ struct batadv_orig_node_vlan { /** * struct batadv_orig_bat_iv - B.A.T.M.A.N. IV private orig_node members - * @bcast_own: bitfield containing the number of our OGMs this orig_node - * rebroadcasted "back" to us (relative to last_real_seqno) - * @bcast_own_sum: counted result of bcast_own + * @bcast_own: set of bitfields (one per hard interface) where each one counts + * the number of our OGMs this orig_node rebroadcasted "back" to us (relative + * to last_real_seqno). Every bitfield is BATADV_TQ_LOCAL_WINDOW_SIZE bits long. + * @bcast_own_sum: sum of bcast_own * @ogm_cnt_lock: lock protecting bcast_own, bcast_own_sum, * neigh_node->bat_iv.real_bits & neigh_node->bat_iv.real_packet_count */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2015