[batctl] master: batctl: fix endianness when reading radiotap header (440ae55)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batctl
On branch : master
>---------------------------------------------------------------
commit 440ae55a6ef96eb73ee628f9237915cf9fb26dee
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Wed Apr 29 12:09:44 2020 +0200
batctl: fix endianness when reading radiotap header
All radiotap header fields are specified in little endian byte-order.
Header length conversion is necessary on some platforms.
Fixes: c6fcdb6dc9a9 ("batctl: add radiotap wifi packet decapsulation support")
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
440ae55a6ef96eb73ee628f9237915cf9fb26dee
tcpdump.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tcpdump.c b/tcpdump.c
index 4b9e4f6..db93681 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -15,6 +15,7 @@
#include <time.h>
#include <sys/time.h>
#include <arpa/inet.h>
+#include <endian.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <netinet/in.h>
@@ -1144,10 +1145,10 @@ static int monitor_header_length(unsigned char *packet_buff, ssize_t buff_len, i
return -1;
radiotap_hdr = (struct radiotap_header*)packet_buff;
- if (buff_len <= radiotap_hdr->it_len)
+ if (buff_len <= le16toh(radiotap_hdr->it_len))
return -1;
else
- return radiotap_hdr->it_len;
+ return le16toh(radiotap_hdr->it_len);
}
return -1;
2 years, 9 months
[batctl] master: Merge branch 'maint' (b784b45)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batctl
On branch : master
>---------------------------------------------------------------
commit b784b4537a7cda52560f781b9e91bec4266f4003
Merge: 18f9209 440ae55
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Wed Apr 29 12:53:38 2020 +0200
Merge branch 'maint'
>---------------------------------------------------------------
b784b4537a7cda52560f781b9e91bec4266f4003
tcpdump.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
2 years, 9 months
[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20200427, created. batadv-next-for-davem-20200427
by postmaster@open-mesh.org
The annotated tag, batadv-next-for-davem-20200427 has been created
at 916fe82e92e64975f23fa62b6c519adbc5bd1a66 (tag)
tagging e73f94d1b6f05f6f22434c63de255a9dec6fd23d (commit)
replaces v5.7-rc1
tagged by Simon Wunderlich
on Mon Apr 27 17:04:17 2020 +0200
- Shortlog ------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- fix spelling error, by Sven Eckelmann
- drop unneeded types.h include, by Sven Eckelmann
- change random number generation to prandom_u32_max(),
by Sven Eckelmann
- remove unused function batadv_arp_change_timeout(), by Yue Haibing
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl6m9HEWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoeKyEADJXMFP14aDblfXDyA/JwEJO7E8
R1YRjbCz7t5gqJbGQGfqGZo0TgpSqvYXVJZEL8ARXR9hIpJEaUiVaMBOOEDTuJj8
kBG/LupxUYpLPUXWobJRFwhAn+Q8z69gyNacF+/upuYaAJCJSLjOitcttjAeVdD+
w3M6Eyw6RGpKIa17E0wG4cwRd2vvJ7SY/Sv4i5G7eiD7PmfsaVYXvyowjk0OZryP
RhytuKx/+e/hv1fS66aW0AdiuLjH/zKDNTDEb+QXePrEyT9DutRu33l1EFgXPfmP
VsTWxCYPNzj3CREfGdYh6ETmZeYMbkGM4Rt7yETXO/lUI5bhyPxzPBlZdYmP4XEN
WZ2ggFvY01UagYmqV9GNr71IWkmCoI1vfphoEBktv41sIQW26g7ByrQRzU7zhNOp
W9fNIzVt1Y6PiIcZRyVoZ3VwEn9db7T1uX669vGwaxFigL9/r2dcrj+pQfLN5kj6
qigz/XMjawq5DloyyunSiu3qJ9iTsv3Dh0MeVBhBRdFeZEVht7whHAPqWhxxgpL/
1FuEPqHSCVmc10IDR9VChVm1Xq9GaIVGdekW2hMNl6ry+T1f6b5akjWSa46r1mWO
byIK3maK6s52Bwa9d4W2fGzKTbxBG9U2PYWP4IlTyr2hRDQbcL+RK6FJfZ068h/d
I26onCKv/mURd6OUxw==
=5bKt
-----END PGP SIGNATURE-----
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (3):
batman-adv: Fix spelling error in term buffer
batman-adv: trace: Drop unneeded types.h include
batman-adv: Utilize prandom_u32_max for random [0, max) values
YueHaibing (1):
batman-adv: remove unused inline function batadv_arp_change_timeout
-----------------------------------------------------------------------
--
linux integration
2 years, 9 months
[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20200427, updated. batadv-net-for-davem-20200427
by postmaster@open-mesh.org
The annotated tag, batadv-net-for-davem-20200427 has been updated
to 70cae4f166607f078594892c325349d5d22dbac5 (tag)
from ac83a0a80c7ca9f882a3a760837e230c00e2e500 (which is now obsolete)
tagging 6f91a3f7af4186099dd10fa530dd7e0d9c29747d (commit)
replaces v5.7-rc1
tagged by Simon Wunderlich
on Mon Apr 27 16:58:57 2020 +0200
- Shortlog ------------------------------------------------------------
Here are some batman-adv bugfixes:
- fix random number generation in network coding, by George Spelvin
- fix reference counter leaks, by Xiyu Yang (3 patches)
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl6m8zEWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoc4dD/9rKLN853rKJe30QkOBJeinSJOO
/aEgCbsOVxgLCfvZxdiwSDQRTPFxChXcNZri6cuHu4h7T9ZYcBEKQNRy4D//h9YH
9wx2+WP7rTKtfScVqOnBf+03fIYzOS9qQnpoA/6id3YIqg5AAhCTB2n5CS1/ILI4
6WrDfsJH4jgol4Ud+lVAFSokjElxVpQ+5AlcKVTBGli1f4aReu7g3xPSZVIBuikz
axsO3UEfzLNU+k+Y3Y+/97HWdaEFelIkLoymZSSOxJ/BRX2Dz8M/eUyy/p5iVzb2
gSF46estgvJodVYrwUEb3UtSSpHP0p562h2QxxjqgayObpJQDwKNeEWkmwHb5RcF
a8l025LlA9+iW25r/RttXiQ0FoLymY1PCdcsY36MZUXAnFn0UyRv/Zt1CUosoImc
C9+CA7jM9XlXeipXnHQvNryUcqwsJJI1hUF7WmIRuOAdeqcvNPTzLiCYWAGQmZ4U
V9CdHQseFKgNnDTaoraW5AMJmuP8frXKcdJd4XWJvOgQO6rX53VTEYqmzqBjFjQZ
dynAIY1w+REmbqYeROgpp02VVXpXw7LVgKRyQIaDJa0cjXfpgmWATyWuewgLgfyK
9EGp2Adu4z7QoVRG7I9Uq2UwPuDVPbbKohNgQZsJt98itKkqv1afQ8U83ref6LQO
5/Mbxke3iQ9ftYVqlg==
=fNPb
-----END PGP SIGNATURE-----
George Spelvin (1):
batman-adv: fix batadv_nc_random_weight_tq
Xiyu Yang (3):
batman-adv: Fix refcnt leak in batadv_show_throughput_override
batman-adv: Fix refcnt leak in batadv_store_throughput_override
batman-adv: Fix refcnt leak in batadv_v_ogm_process
-----------------------------------------------------------------------
--
linux integration
2 years, 9 months
[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20200427, created. batadv-net-for-davem-20200427
by postmaster@open-mesh.org
The annotated tag, batadv-net-for-davem-20200427 has been created
at ac83a0a80c7ca9f882a3a760837e230c00e2e500 (tag)
tagging 6f91a3f7af4186099dd10fa530dd7e0d9c29747d (commit)
replaces v5.7-rc1
tagged by Simon Wunderlich
on Mon Apr 27 16:56:35 2020 +0200
- Shortlog ------------------------------------------------------------
Here are some batman-adv bugfixes:
- fix random number generation in network coding, by George Spelvin
- fix reference counter leaks, by Xiy Yang (3 patches)
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl6m8qMWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoVC6D/9uP+9aaq0WqorCKMahRTh+7VSH
txwVX9iRo98EOxRJEWIXKPtWMSuitr24w6ptdhyRx1VWRu7sgLQM2xcm6irxaF1o
0DIceQ/mXrZvlIgta68Dy/WjQv5zjS7BZyrKHdiVU5VZxOihQXiA31nDNrckVUad
lwVL/tD6Q6ecIWth2cg+2rFrsjQ1od/5Dz2RpmwVFTekCSu5kV2zPqYGq08YkcwM
TgHSMRkzr+AKwfWnluBoyxcp88uwCcn11OxlA2vhH6LUwadZNfREbZsCPPJZBeUr
/uX5CuZEqPlOF/jkjjo03NzOK2YAqy4Mky9VB0LAs2EgozySUcOj9jvbK+X5kVVy
eCk0azn17PnsLrCP6I5phkMNY0n5BK+v1Y6NrCM53lVIojLkddAoYfDx6YOmJXl5
gtVE0Y1OSx6RQW+8H1z3Ega1uP8sawZwF4RoEnj0n1jySLJkTo5eOzSJT957dwIm
QWXmuYB9KJ7SmlEBkG5vhqRo1tpNksMaVPkctrb0l8wMfMJPKFGpgx+8xCXu1OJS
/rERs1FH365ygyqZxeThdemPhzaM6l/6TjZnl+XS3GAm5I+go+L6LGYZjB88YtxX
wDDhHSItwNmmnDqznzkfPJxlwEF2s6vicHydNgtcD+oexX77+0Manp5PjEknuZF/
fDnHnnIddmtwOXfFLw==
=IbB6
-----END PGP SIGNATURE-----
George Spelvin (1):
batman-adv: fix batadv_nc_random_weight_tq
Xiyu Yang (3):
batman-adv: Fix refcnt leak in batadv_show_throughput_override
batman-adv: Fix refcnt leak in batadv_store_throughput_override
batman-adv: Fix refcnt leak in batadv_v_ogm_process
-----------------------------------------------------------------------
--
linux integration
2 years, 9 months
[linux-merge]linux integration; annotated tag, v5.7-rc3, created. v5.7-rc3
by postmaster@open-mesh.org
The annotated tag, v5.7-rc3 has been created
at d0709bb6da2ab6d49b11643e98abdf79b1a2817f (tag)
tagging 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (commit)
replaces v5.7-rc2
tagged by Linus Torvalds
on Sun Apr 26 13:51:09 2020 -0700
- Shortlog ------------------------------------------------------------
Linux 5.7-rc3
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl6l9D0eHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGthEH/jEMvU7Hc6zIGNmG
Akrjf7q6NX+wfmqKIsmSmvvoE1c2OioBYmCzlVz4sQFRj0Yy5WYJcI4Bzh+y8cOA
0GQ6eQNhfVGyj7uiTClkccK8G20M59HQ1C34Oa/u3Ofoy4S89DiNa5aEY9TxWx9B
jNV3rCfPgwKaPfwsO5oaIWZd1Ah5mwwwqxICnw7WQfdplQ76eqi/lL7jArncPjmN
01yyAwsCZyfaeO2NqmHrCOlZkFJcP8Ftj0XeFK94XKdl6VrXuKtEX0JBa3RRWGA+
KSWBhx4Ml6Q1hnYAIA6T78XKawhoeF+MErlmdBpez4EDd7vCOqz2HXnip6DYh2v7
wkcvNtg=
=2hir
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
2 years, 9 months
[batman-adv] master: batman-adv: Utilize prandom_u32_max for random [0, max) values (cdd16da5)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit cdd16da586633a7df7d96bd6e9bc08129f5d3d80
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Apr 13 21:37:24 2020 +0200
batman-adv: Utilize prandom_u32_max for random [0, max) values
The kernel provides a function to create random values from 0 - (max-1)
since commit f337db64af05 ("random32: add prandom_u32_max and convert open
coded users"). Simply use this function to replace code sections which use
prandom_u32 and a handcrafted method to map it to the correct range.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
cdd16da586633a7df7d96bd6e9bc08129f5d3d80
net/batman-adv/bat_iv_ogm.c | 4 ++--
net/batman-adv/bat_v_elp.c | 2 +-
net/batman-adv/bat_v_ogm.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index a7c8dd7a..e87f19c8 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -280,7 +280,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv)
unsigned int msecs;
msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER;
- msecs += prandom_u32() % (2 * BATADV_JITTER);
+ msecs += prandom_u32_max(2 * BATADV_JITTER);
return jiffies + msecs_to_jiffies(msecs);
}
@@ -288,7 +288,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv)
/* when do we schedule a ogm packet to be sent */
static unsigned long batadv_iv_ogm_fwd_send_time(void)
{
- return jiffies + msecs_to_jiffies(prandom_u32() % (BATADV_JITTER / 2));
+ return jiffies + msecs_to_jiffies(prandom_u32_max(BATADV_JITTER / 2));
}
/* apply hop penalty for a normal link */
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index 1e3172db..353e49c4 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -49,7 +49,7 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface)
unsigned int msecs;
msecs = atomic_read(&hard_iface->bat_v.elp_interval) - BATADV_JITTER;
- msecs += prandom_u32() % (2 * BATADV_JITTER);
+ msecs += prandom_u32_max(2 * BATADV_JITTER);
queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_v.elp_wq,
msecs_to_jiffies(msecs));
diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c
index 80b87b1f..18028b9f 100644
--- a/net/batman-adv/bat_v_ogm.c
+++ b/net/batman-adv/bat_v_ogm.c
@@ -88,7 +88,7 @@ static void batadv_v_ogm_start_queue_timer(struct batadv_hard_iface *hard_iface)
unsigned int msecs = BATADV_MAX_AGGREGATION_MS * 1000;
/* msecs * [0.9, 1.1] */
- msecs += prandom_u32() % (msecs / 5) - (msecs / 10);
+ msecs += prandom_u32_max(msecs / 5) - (msecs / 10);
queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_v.aggr_wq,
msecs_to_jiffies(msecs / 1000));
}
@@ -107,7 +107,7 @@ static void batadv_v_ogm_start_timer(struct batadv_priv *bat_priv)
return;
msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER;
- msecs += prandom_u32() % (2 * BATADV_JITTER);
+ msecs += prandom_u32_max(2 * BATADV_JITTER);
queue_delayed_work(batadv_event_workqueue, &bat_priv->bat_v.ogm_wq,
msecs_to_jiffies(msecs));
}
2 years, 9 months
[batman-adv] master: batman-adv: trace: Drop unneeded types.h include (314d7856)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 314d7856b0b93c51beeacbf9bc103b3f332cea52
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Mon Apr 13 20:26:07 2020 +0200
batman-adv: trace: Drop unneeded types.h include
The commit 04ae87a52074 ("ftrace: Rework event_create_dir()") restructured
various macros in the ftrace framework. These changes also had the nice
side effect that the linux/types.h include is no longer necessary to define
some of the types used by these macros.
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
314d7856b0b93c51beeacbf9bc103b3f332cea52
net/batman-adv/trace.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/batman-adv/trace.h b/net/batman-adv/trace.h
index f631b1e0..a8754757 100644
--- a/net/batman-adv/trace.h
+++ b/net/batman-adv/trace.h
@@ -15,7 +15,6 @@
#include <linux/percpu.h>
#include <linux/printk.h>
#include <linux/tracepoint.h>
-#include <linux/types.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM batadv
2 years, 9 months
[batman-adv] master: batman-adv: remove unsued inline function batadv_arp_change_timeout (60fe065f)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 60fe065f84b74b07318fe2fa18dcdc6f10f1a0d6
Author: YueHaibing <yuehaibing(a)huawei.com>
Date: Fri Apr 24 21:14:37 2020 +0800
batman-adv: remove unsued inline function batadv_arp_change_timeout
There's no callers in-tree.
Signed-off-by: YueHaibing <yuehaibing(a)huawei.com>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
60fe065f84b74b07318fe2fa18dcdc6f10f1a0d6
net/batman-adv/distributed-arp-table.h | 5 -----
1 file changed, 5 deletions(-)
diff --git a/net/batman-adv/distributed-arp-table.h b/net/batman-adv/distributed-arp-table.h
index 2bff2f4a..4e031661 100644
--- a/net/batman-adv/distributed-arp-table.h
+++ b/net/batman-adv/distributed-arp-table.h
@@ -163,11 +163,6 @@ static inline void batadv_dat_init_own_addr(struct batadv_priv *bat_priv,
{
}
-static inline void batadv_arp_change_timeout(struct net_device *soft_iface,
- const char *name)
-{
-}
-
static inline int batadv_dat_init(struct batadv_priv *bat_priv)
{
return 0;
2 years, 9 months