[linux-merge]linux integration; annotated tag, v5.0-rc4, created. v5.0-rc4
by postmaster＠open-mesh.org
The annotated tag, v5.0-rc4 has been created
at 9a57b893babc8ea26e887dd82d5d4b63c0dea9a4 (tag)
tagging f17b5f06cb92ef2250513a1e154c47b78df07d40 (commit)
replaces v5.0-rc3
tagged by Linus Torvalds
on Sun Jan 27 15:18:12 2019 -0800
- Shortlog ------------------------------------------------------------
Linux 5.0-rc4
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlxOPDQeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGDSMH/iL9l5FKUuoajT2Q
tYsbzbBQPYXe+NBizD+ci5evTIBnbZ1XJQ8OAS2Pge9oXh9+1HUD/eWIIkAXCVkA
yhvMU585DPVx3TPAwOjKXHCXEgiRX/sj+rLQpssxgDpZ2BBepqmBOMbojQJ8UIHg
e6JAZBlsoTlRX9+gg3Dy+kOuEg4ioJOTQHQ+0fS0WKL+N26GAVpssB/cqm9xYx1k
gnVyOubxPrcI3KZXsJp164njnuiZwnvX3kTBfeDEPL6dg1PrJqnBu+cU5qKCkVWC
k4/SIcxLdsFJsXAWYjbS9AMEowg44nTzMe1JhFY4UKor3GXn58VLnXzEuiwgCmAv
TEXOfnc=
=ajsU
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
4 years
[batman-adv] master: Merge branch 'maint' (de9685d6)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit de9685d64009f4a619cfa456291054d9a020b0d9
Merge: 954cd5d7 e6150db8
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat Jan 26 22:02:38 2019 +0100
Merge branch 'maint'
>---------------------------------------------------------------
de9685d64009f4a619cfa456291054d9a020b0d9
compat-include/net/cfg80211.h | 7 +++++++
net/batman-adv/bat_v_elp.c | 3 +++
2 files changed, 10 insertions(+)
4 years
[batman-adv] master: batman-adv: release station info tidstats (e6150db8)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit e6150db855210a085feb4c5e4daadb285a668bba
Author: Felix Fietkau <nbd(a)nbd.name>
Date: Fri Jan 25 09:02:05 2019 +0100
batman-adv: release station info tidstats
With the addition of TXQ stats in the per-tid statistics the struct
station_info grew significantly. This resulted in stack size warnings
due to the structure itself being above the limit for the warnings.
To work around this, the TID array was allocated dynamically. Also a
function to free this content was introduced with commit 7ea3e110f2f8
("cfg80211: release station info tidstats where needed") but the necessary
changes were not provided for batman-adv's B.A.T.M.A.N. V implementation.
Signed-off-by: Felix Fietkau <nbd(a)nbd.name>
Fixes: 8689c051a201 ("cfg80211: dynamically allocate per-tid stats for station info")
[sven(a)narfation.org: add commit message, add compat code]
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
e6150db855210a085feb4c5e4daadb285a668bba
compat-include/net/cfg80211.h | 7 +++++++
net/batman-adv/bat_v_elp.c | 3 +++
2 files changed, 10 insertions(+)
diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h
index 79c028af..6b6a0287 100644
--- a/compat-include/net/cfg80211.h
+++ b/compat-include/net/cfg80211.h
@@ -79,4 +79,11 @@ static inline int batadv_cfg80211_get_station(struct net_device *dev,
#endif /* < KERNEL_VERSION(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) */
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
+
+#define cfg80211_sinfo_release_content(sinfo)
+
+#endif /* < KERNEL_VERSION(4, 18, 0) */
+
#endif /* _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ */
diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c
index e8090f09..ef0dec20 100644
--- a/net/batman-adv/bat_v_elp.c
+++ b/net/batman-adv/bat_v_elp.c
@@ -104,6 +104,9 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh)
ret = cfg80211_get_station(real_netdev, neigh->addr, &sinfo);
+ /* free the TID stats immediately */
+ cfg80211_sinfo_release_content(&sinfo);
+
dev_put(real_netdev);
if (ret == -ENOENT) {
/* Node is not associated anymore! It would be
4 years
[linux-merge]linux integration; annotated tag, v5.0-rc3, created. v5.0-rc3
by postmaster＠open-mesh.org
The annotated tag, v5.0-rc3 has been created
at 0c356ad876fa1d72f08a9eef059e6d6ebe3a6e4d (tag)
tagging 49a57857aeea06ca831043acbb0fa5e0f50602fd (commit)
replaces v5.0-rc2
tagged by Linus Torvalds
on Mon Jan 21 13:14:53 2019 +1300
- Shortlog ------------------------------------------------------------
Linux 5.0-rc3
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlxFDv0eHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGBPsH/3Ij47fut8kwxGSX
Tmx7Y+VYftRiKSwK3+HxsCvde3scqfkxAukb3HeJDzZdpnouT0k4nqUYQabAANi/
MdaO+NSBRp/NjzZcpFG9QAroIQ2G2sRQ4E8ldFcNmdsjZWlUfKIHPfYHzvvc06L4
MhvdkpMa/p51Jz9egQs0kfSvrb6fh4OEDTI19/aaGR0oJBhoGhLrqTI+vdYhMiyO
wWtUXgZfsmlCBdAQLRh04CxGTc/32VApoB/SwP9sF+xD3gcL0mPFNKUociio6K2Y
a7u7yuzUKvVwuafVgX9QT+f+je5/5u+WFsG/26cfXzizZoNWW5oDl3sBD3hRNkvt
J13lB1w=
=ch+/
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
4 years
[linux-merge]linux integration; annotated tag, v5.0-rc2, created. v5.0-rc2
by postmaster＠open-mesh.org
The annotated tag, v5.0-rc2 has been created
at 6f38b5d6cfd43dde3058a10c68baae9cf17af912 (tag)
tagging 1c7fc5cbc33980acd13d668f1c8f0313d6ae9fd8 (commit)
replaces v5.0-rc1
tagged by Linus Torvalds
on Mon Jan 14 10:41:20 2019 +1200
- Shortlog ------------------------------------------------------------
Linux 5.0-rc2
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlw7vpAeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGnPwH/0eJyaZtQc0gfgPG
27eys6R3RMaZ8MLFGJfLxjZE9/Y6PY2VpkKzNN0neYKTX9LzT6CwpqSBZVD6Y070
3ibq1sJJW2K3UC2SgTizjsD0yj31xm7DfU/0TdVDwhw0kizUQwWybOtxw+C/MM/7
sVWEw275PEIKE1jwCinXjMGwDOsLEKvCXvNWnj9L65qv+r2134qJ+AiWLKc14mzv
S96ioZxp4LHI9qDwXpRffw+FLBh6VJT7mRAIzWyApCl1lb/qA4imU0898frlp6+l
mjvhKY5qDSgNO/6IlxsXxULcxQGbWjKShFc3rqgCsSnpVMC35Y+OkHOTY+EZaO3q
Oz2tcPo=
=9kwe
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
4 years
[batman-adv] master: batman-adv: Provide 3-argument access_ok fallback (954cd5d7)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 954cd5d73d339baf69206893f797bd54ee100f33
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Sat Jan 12 09:57:38 2019 +0100
batman-adv: Provide 3-argument access_ok fallback
The kernels 3.16-3.18 use the 3-arguments access_ok macro in header
files. When we remove this version, the build will fail on these kernels.
with:
include/net/sock.h:1818:22: error: macro "access_ok" passed 3 arguments, but takes just 2
In file included from net/batman-adv/bridge_loop_avoidance.c:52:0:
include/net/sock.h: In function ‘skb_do_copy_data_nocache’:
include/net/sock.h:1818:41: error: macro "access_ok" passed 3 arguments, but takes just 2
if (!access_ok(VERIFY_READ, from, copy) ||
^
include/net/sock.h:1818:8: error: ‘access_ok’ undeclared (first use in this function)
if (!access_ok(VERIFY_READ, from, copy) ||
^~~~~~~~~
Fixes: 8af877b11054 ("batman-adv: Remove 'type' argument from access_ok() function")
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
954cd5d73d339baf69206893f797bd54ee100f33
compat-include/linux/uaccess.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/compat-include/linux/uaccess.h b/compat-include/linux/uaccess.h
index 0cd56a60..3a6ee47d 100644
--- a/compat-include/linux/uaccess.h
+++ b/compat-include/linux/uaccess.h
@@ -37,7 +37,12 @@ static inline int batadv_access_ok(int type, const void __user *p,
#undef access_ok
#endif
-#define access_ok(addr, size) batadv_access_ok(VERIFY_WRITE, (addr), (size))
+#define access_ok_get(_1, _2, _3 , access_ok_name, ...) access_ok_name
+#define access_ok(...) \
+ access_ok_get(__VA_ARGS__, access_ok3, access_ok2)(__VA_ARGS__)
+
+#define access_ok2(addr, size) batadv_access_ok(VERIFY_WRITE, (addr), (size))
+#define access_ok3(type, addr, size) batadv_access_ok((type), (addr), (size))
#endif /* < KERNEL_VERSION(5, 0, 0) */
4 years
[batman-adv] master: batman-adv: Remove 'type' argument from access_ok() function (8af877b1)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 8af877b110548408b1fdf7ddbed830be68d7fb05
Author: Linus Torvalds <torvalds(a)linux-foundation.org>
Date: Tue Jan 8 09:16:21 2019 +0100
batman-adv: Remove 'type' argument from access_ok() function
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org>
[sven(a)narfation.org: Added compat code]
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
8af877b110548408b1fdf7ddbed830be68d7fb05
compat-include/linux/{compiler.h => uaccess.h} | 28 ++++++++++++++------------
net/batman-adv/icmp_socket.c | 2 +-
net/batman-adv/log.c | 2 +-
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/compat-include/linux/compiler.h b/compat-include/linux/uaccess.h
similarity index 62%
copy from compat-include/linux/compiler.h
copy to compat-include/linux/uaccess.h
index f4a84b11..0cd56a60 100644
--- a/compat-include/linux/compiler.h
+++ b/compat-include/linux/uaccess.h
@@ -19,24 +19,26 @@
* of the Linux kernel.
*/
-#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_
-#define _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_
+#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_UACCESS_H_
+#define _NET_BATMAN_ADV_COMPAT_LINUX_UACCESS_H_
#include <linux/version.h>
-#include_next <linux/compiler.h>
+#include_next <linux/uaccess.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
-#ifndef READ_ONCE
-#define READ_ONCE(x) ACCESS_ONCE(x)
-#endif
+static inline int batadv_access_ok(int type, const void __user *p,
+ unsigned long size)
+{
+ return access_ok(type, p, size);
+}
-#ifndef WRITE_ONCE
-#define WRITE_ONCE(x, val) ({ \
- ACCESS_ONCE(x) = (val); \
-})
+#ifdef access_ok
+#undef access_ok
#endif
-#endif /* < KERNEL_VERSION(3, 19, 0) */
+#define access_ok(addr, size) batadv_access_ok(VERIFY_WRITE, (addr), (size))
+
+#endif /* < KERNEL_VERSION(5, 0, 0) */
-#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */
+#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_UACCESS_H_ */
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index d34bb79e..9859abab 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -147,7 +147,7 @@ static ssize_t batadv_socket_read(struct file *file, char __user *buf,
if (!buf || count < sizeof(struct batadv_icmp_packet))
return -EINVAL;
- if (!access_ok(VERIFY_WRITE, buf, count))
+ if (!access_ok(buf, count))
return -EFAULT;
error = wait_event_interruptible(socket_client->queue_wait,
diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c
index f97849a8..3e610df8 100644
--- a/net/batman-adv/log.c
+++ b/net/batman-adv/log.c
@@ -136,7 +136,7 @@ static ssize_t batadv_log_read(struct file *file, char __user *buf,
if (count == 0)
return 0;
- if (!access_ok(VERIFY_WRITE, buf, count))
+ if (!access_ok(buf, count))
return -EFAULT;
error = wait_event_interruptible(debug_log->queue_wait,
4 years
[linux-merge]linux integration; annotated tag, v5.0-rc1, created. v5.0-rc1
by postmaster＠open-mesh.org
The annotated tag, v5.0-rc1 has been created
at 0dd18ffb54df420d2c7d25bc5259942dbbc2a610 (tag)
tagging bfeffd155283772bbe78c6a05dec7c0128ee500c (commit)
replaces v4.20
tagged by Linus Torvalds
on Sun Jan 6 17:08:29 2019 -0800
- Shortlog ------------------------------------------------------------
Linux 5.0-rc1
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlwypo0eHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGE3EH/2kpOxM9TbGlqsiY
xDyNKMCD88lRIBeM5BRUS3sdnf+ztw9dwB5DOiNGpcjS+RZdHYzjSx9BnCLMiI/S
H7cGht+ULFbclGxN8+0j3arJewXkZvN5McpNDE45vLWg7L3qJhk8pZ7EF29VqtB7
hgKN7tEX7kOOaEcRxX3vgvz49JsaTVP2IwInNS1YWfli0e//or+hQzK71bU0mONa
zS15qFI+Znj8YYXPn7Wpbc21kTxZfyS1oawK7QfF96NkBhUjF8g1iMJfBRgDPiPU
yZ2G2ngMDUDIXIQDe697Osh2sCPoK3t61YJvLFCReH6jByUVqnk8aEZ3h9SBJcu2
iDYZWAc=
=r50X
-----END PGP SIGNATURE-----
David S. Miller (1):
Merge git://git.kernel.org/.../davem/net
Linus Lüssing (1):
batman-adv: enable MCAST by default at compile time
Linus Torvalds (1):
Remove 'type' argument from access_ok() function
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (14):
batman-adv: Drop unused lockdep include
batman-adv: Add includes for deprecation warning
batman-adv: Improve includes for trace functionality
batman-adv: Allow to use BATMAN_ADV_DEBUG without BATMAN_ADV_DEBUGFS
batman-adv: Fix description for BATMAN_ADV_DEBUG
batman-adv: Add inconsistent gateway netlink dump detection
batman-adv: Add inconsistent hardif netlink dump detection
batman-adv: Store modification counter via hash helpers
batman-adv: Add inconsistent backbone netlink dump detection
batman-adv: Add inconsistent claim netlink dump detection
batman-adv: Add inconsistent dat netlink dump detection
batman-adv: Add inconsistent local TT netlink dump detection
batman-adv: Add inconsistent multicast netlink dump detection
batman-adv: Move CRC16 dependency to BATMAN_ADV_BLA
-----------------------------------------------------------------------
--
linux integration
4 years, 1 month
[batman-adv] master: Merge branch 'maint' (89ba2134)
by postmaster＠open-mesh.org
Repository : ssh://git@open-mesh.org/batman-adv
On branch : master
>---------------------------------------------------------------
commit 89ba213446900622af67e2b0c9e70abdc9341682
Merge: 83444b56 74c4b0c5
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Fri Jan 4 11:08:45 2019 +0100
Merge branch 'maint'
>---------------------------------------------------------------
89ba213446900622af67e2b0c9e70abdc9341682
net/batman-adv/hard-interface.c | 5 +++--
net/batman-adv/soft-interface.c | 2 ++
2 files changed, 5 insertions(+), 2 deletions(-)
4 years, 1 month