The annotated tag, v3.18-rc6 has been created
at d1bc5bd19d31306a08b3f29e20caba92feae30f1 (tag)
tagging 5d01410fe4d92081f349b013a2e7a95429e4f2c9 (commit)
replaces v3.18-rc5
tagged by Linus Torvalds
on Sun Nov 23 15:25:31 2014 -0800
- Shortlog ------------------------------------------------------------
Linux 3.18-rc6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJUcmzrAAoJEHm+PkMAQRiGUskH/il9ul71lyyvrA/bRbi0GfUa
2Ej1Q4Fa/SRzLMiWF8Wy/AlYBbl4/uD3a3XEueK4f9dNguTLZF/rwXTlKKzUeiGg
zFObbJg3zfa926PQcEV5mc+h71ZkWmbH5CjF6GfYIlj6kjVa5MXF3lSZz27DoAx3
DjoLKpj1fXQJu1HD7xvUn0r720RgYfic9iKdS69eEYex+Js92WySukogvMG5WAVD
xuwlJcJgm0YpgNr1t1ij4ekE5XR9jjiE4EXbOZYWcOOd+YXAwZpBrKOgxP0gma3w
OGwEvmAbzf/3IsGq3dPFYWQ2nfiLA/Qh7y20E19FLKpPBu5ZuTEgFU8VTxh+k+g=
=rRmA
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
The annotated tag, v3.18-rc5 has been created
at d9d0c8bfbf103d15a640cf04349bf762644614f2 (tag)
tagging fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (commit)
replaces v3.18-rc4
tagged by Linus Torvalds
on Sun Nov 16 16:36:27 2014 -0800
- Shortlog ------------------------------------------------------------
Linux 3.18-rc5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAABAgAGBQJUaUMLAAoJEHm+PkMAQRiGHEUH/jOJJwg5uK5bB47Z33ZK35Hd
J6/hcOUDhKlYBNUu8pRC8qnk/0w4YpAJcQS6yODri4hHNDP1z+Xbj9nAyA3Hzjwl
T2ZpZg/DFI5mt5MkMEziQJyyfpRNWTOwJGVZYFttro7ofg7GOqK4u8h7fhAf26rO
6AoPZB7qkwAKkyQmoELuXu3yUA+zMWxLh4UI7tyBLIX8ovrPhUBzF/eNcv5r5sFd
W8VrK6jdM3Wu7/vU+cH+36E78LuUPZZ4fHWTbXgtLUfE92bT6YN8qTGJH9xNS9H4
6iU58ndb9Sjl9Tr5ZtA7doRG1WUImUKpmFUafavuflKjKKIYps/TuYi4HJ/n+2s=
=E3q/
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
Repository : ssh://git@open-mesh.org/batman-adv
Branch 'next' now includes:
cb2b79e batman-adv: avoid NULL dereferences and fix if check
5105158 Merge branch 'maint' into next
Repository : ssh://git@open-mesh.org/batman-adv
On branch : maint
>---------------------------------------------------------------
commit cb2b79e4dfd215cc53f3cd55afb15a6b69e5bcfc
Author: Antonio Quartulli <antonio(a)meshcoding.com>
Date: Sat Sep 20 18:22:05 2014 +0200
batman-adv: avoid NULL dereferences and fix if check
Gateway having bandwidth_down equal to zero are not accepted
at all and so never added to the Gateway list.
For this reason checking the bandwidth_down member in
batadv_gw_out_of_range() is useless.
This is probably a copy/paste error and this check was supposed
to be "!gw_node" only. Moreover, the way the check is written
now may also lead to a NULL dereference.
Fix this by rewriting the if-condition properly.
Introduced by 0853ec7fafe0a195754454832993c6b35e22b842
("batman-adv: tvlv - gateway download/upload bandwidth container")
Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com>
Reported-by: David Binderman <dcb314(a)hotmail.com>
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
>---------------------------------------------------------------
cb2b79e4dfd215cc53f3cd55afb15a6b69e5bcfc
gateway_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gateway_client.c b/gateway_client.c
index 90cff58..e0bcf9e 100644
--- a/gateway_client.c
+++ b/gateway_client.c
@@ -810,7 +810,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
goto out;
gw_node = batadv_gw_node_get(bat_priv, orig_dst_node);
- if (!gw_node->bandwidth_down == 0)
+ if (!gw_node)
goto out;
switch (atomic_read(&bat_priv->gw_mode)) {