Version bump to patchset of Feb 15th. Thanks Antonio Quartulli, bug 457826.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

7 files changed, 228 insertions, 5 deletions

diff --git a/net-misc/batman-adv/ChangeLog b/net-misc/batman-adv/ChangeLog
index 52c0748b36eb..f4fd4fda8963 100644
--- a/net-misc/batman-adv/ChangeLog
+++ b/net-misc/batman-adv/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-misc/batman-adv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/ChangeLog,v 1.10 2013/01/14 11:08:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/ChangeLog,v 1.11 2013/02/17 21:57:32 xmw Exp $
+
+*batman-adv-2013.0.0_p20130215 (17 Feb 2013)
+
+  17 Feb 2013; Michael Weber <xmw@gentoo.org>
+  +batman-adv-2013.0.0_p20130215.ebuild,
+  +files/batman-adv-2013.0.0-0001-fix-skb-leak-in-batadv_dat_snoop_incoming.pat
+  ch,
+  +files/batman-adv-2013.0.0-0002-check-for-more-types-of-invalid-IP-addres.pat
+  ch,
+  +files/batman-adv-2013.0.0-0003-filter-ARP-packets-with-invalid-MAC-addre.pat
+  ch,
+  +files/batman-adv-2013.0.0-0004-Fix-NULL-pointer-dereference-in-DAT-hash-.pat
+  ch:
+  Version bump to patchset of Feb 15th. Thanks Antonio Quartulli, bug 457826.
 
 *batman-adv-2013.0.0 (14 Jan 2013)
 
diff --git a/net-misc/batman-adv/Manifest b/net-misc/batman-adv/Manifest
index 021219515b2f..933e2844725a 100644
--- a/net-misc/batman-adv/Manifest
+++ b/net-misc/batman-adv/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX batman-adv-2013.0.0-0001-fix-skb-leak-in-batadv_dat_snoop_incoming.patch 1143 SHA256 9ba73cf77712ebcd363335b883520db4f941e8a14ebd5e14e061754666ab806b SHA512 6a7e5110ec2a94cc700bc668a8304b831f551c90172548410976c81590f6ea94d609b7c4abd013942b01e713c890776c463969ab30cc592664700c4c16425220 WHIRLPOOL bac6f09bff225edb291c1d68467deddafbd7541e7ace3335b06de902bcf572a75427ba905778e809d6e2e4c484f0c55f4ecd27bba2d9ad53b17ef8800cc85b40
+AUX batman-adv-2013.0.0-0002-check-for-more-types-of-invalid-IP-addres.patch 1446 SHA256 4dc26c1a41697887abcf7d30ddb9049afe5a89d7b96970441b9b907c6a6857b8 SHA512 48c9c212f5de51370f38e0bcaba2756f7a9995472ec93fc6ed2408ec1f603f7bcd6dcea96e662dc7027b71e7e127177bce7142a5e5c0ec6cace752ab91730182 WHIRLPOOL 9c9821b33d2eafa562ba281f6595f18247ad3df5c251ae89870015212a4f6930c223ec0675cac95d5902117b99116c5b6bf657d2fa1eb10ef262ca569c7ebdb2
+AUX batman-adv-2013.0.0-0003-filter-ARP-packets-with-invalid-MAC-addre.patch 1686 SHA256 9e98452d292c99c92d85668b8d0f454fd80c19b88725475892472943424c9669 SHA512 e5ce83854bcd43d4345b86787bb4bbfa2d1734bed67a30d302657aec1c92930f5718c4d572d00b025e986c24b202d515bf72cf56a4fc44a191cdd3fe9d15784e WHIRLPOOL 78b96abec243dedc6bf0c2e55ca113f76fda1178fd85841ef42a65e59a81d0248e839a2ff68f5022f4241b8cdd277d3afd44768360d7b2e8539d2f0c69ad16b7
+AUX batman-adv-2013.0.0-0004-Fix-NULL-pointer-dereference-in-DAT-hash-.patch 1534 SHA256 9982f4c02eb635a5675c13912f808d5060a9001eb623a090e35d1ef355c6f0a0 SHA512 6bcf6cb2a51afc47daa990df2d500896872169247b43e6f34fee673f0558d72be0af59672e0298435672ec6a19ddd549a2cde6982dc4f2d1f7216559131d3e7b WHIRLPOOL bdab0f4c77050b4d108910c8975466634b42c168ff17eb08980baf63387148e4b9d12e6bf0b343dee98ff403095a87f5b820a496687cc196c9cf6f4b501cad93
 DIST batman-adv-2012.3.0.tar.gz 97645 SHA256 c6ee5c7c500e998e05f310b73824b852a88c56617c182d73ff90216d5e8dbc45 SHA512 7fb3549624cd05c450323840bfc1878b204a7348f43f80e20a4cfcc188e74ba2e7afaa4e7a4e0ed2b805e63c449fc4657db2054d1f8946b353d2176d8e5731d3 WHIRLPOOL 2779b08ad83614d6ba2c06260de1e009f0da5afb6d7000855005179b10e10e7ca270b63259281f60bb0bf1d52072526ac744d4f3fbd4add861aa2d1122bc9ca8
 DIST batman-adv-2012.4.0.tar.gz 99738 SHA256 11201cce7d18643a3d2358e7045cdeadd5ec6b9727d0c1bac6571fdd149ab0ad SHA512 3bff9c2a95e42b6fdf599534ed6ae31318b8e8a21e6857373731ce094922cf1288b3ba4db19f79f5ac18e9f041720afbcf050135387c2aaaf16b0e7e2822efb0 WHIRLPOOL 7ed2e78ea3aee584c654c56bb3840538416b6938065a82cc6c17f72daa662e514b300d6883f647566f9e41512c74591625b4e581a57f0aff52e963ff5e68a22a
 DIST batman-adv-2013.0.0.tar.gz 114111 SHA256 af51410ae0e4e87a43bc6897d65cdb41fc9bb75033e65ea03c54e868acdb8435 SHA512 a0ad35267366f64b7768819e222c0653ccf2e915d05e6718cd49e0939003c2204ebf166d3d01bc286e869cc1d84c3cbb5e7760b6579283f5e02a47601d272d4f WHIRLPOOL c23c64097e15f33faffd1c50c38f9b77d893a6accb410ac07b9f4f60f129aff35e39e6238007da967f54fa6dc9af45b8993f1dfbe9a9e7955755bcb57b0e2ac5
 EBUILD batman-adv-2012.3.0.ebuild 942 SHA256 303347388c0de80397f6e51e5b8ec4bfed5de52d29d56e34135b6f2eee3dbd20 SHA512 e197178c62a7a472ee489d7a032b228abcc8c7e7998484f12867662c5a108e10fa9086a66b5e4f49a47664f0cf97fcb2200ed35edcf60efb1d94786de9fa5910 WHIRLPOOL 4a550e9a6991a793352db1cf0fea38379d56e74871c528017f121c77d804c1b9c6b32ab5e3f5938f89ec348c6e7a3a28956539e67fec2af02890496f56468619
 EBUILD batman-adv-2012.4.0.ebuild 942 SHA256 f737b3983b9cf4b6ef58e8a37e25ac5f21e4cb66d8baa7bea3d661027b6def04 SHA512 574f65ea74bbed24103d6b75f690dbdf4973b636f2868c3503765d7108b51a212bc4f64e96bc6e5e2c1615ebc72b8703203a2088d56ce7e1490e7be060be8b31 WHIRLPOOL 7201302131d8d9c376f4f0dd101221fd23cafaf50a7d5015624f7b9c535963837a141a8bd128fe2545daded3df66ce0f6d9e474d30aa84370ca635bcc5faad01
 EBUILD batman-adv-2013.0.0.ebuild 1017 SHA256 4317dd30c2a66ebfa22d571623b04582615a7f2e28bd32f0950c0fa7e1344f8c SHA512 1b6d456ef46f74300f469ad6f6563f4a695cee47a23dfb019e11a20444f32b3ab8581ec4bab023284f6dbe155bc2c934c247eed0bb0770912c5f285c5d18393e WHIRLPOOL faa72f8b5218684383ab5fc522f89a81a448f8d3f78d8b63f1e6c4cd6b46904f2e54d3b6084bbecb6ff70ff5127b7cc91b6c532582a11c767096d7c16abcc879
-MISC ChangeLog 2108 SHA256 c523c0254d25fbf2a00a2e2f5ca68ee101cf341a48da00b5755ff13af6336630 SHA512 9467703691d58f428e82fe7fd381df6edba40d2211c9d6e61367f108debf9098b96d42f3b2ebaa63c2cd95cbf6bfe9a9644725a023939503e156a91eef3c693b WHIRLPOOL 4a09ed4db49b8839830f684fb925b0b609a9c487100d86fc8eabf2bce066f3f62d8a78a8b9aad1bf9a05863d5e6539f87ad83bded465353c6637e36c7c7899a9
+EBUILD batman-adv-2013.0.0_p20130215.ebuild 1393 SHA256 b23fe3f18df7ef4846e9d9c2959f32e7ca18e211ae9dcfa222f2f148f9224132 SHA512 7e48bf380bc7299c952b3466aeeb80695471b5456cffdf5ad3377734d69b69e93ee6d73ee7def512f4364fc7fa274327b5654381083c6cfd9d66954b0b0a9e91 WHIRLPOOL 400ab90acdf8863d828d8e48fb7a8c6d80ae46c2e2d48c475a65f84d27d0e1fd0a8c0b0be8cbd649ec5f12f16cfe56989053030f69cd91cb0d1b979188715c37
+MISC ChangeLog 2664 SHA256 408f6b72136fe3de0d8f65809e7e23891a9ad7289094f375621f8185cd470066 SHA512 31f20bf87d2a60dc1862eb2859a4b517889d650331c2ff67a1ce3c4e476776c68cfd6761e04dba97ac6a666ab0fb4ff0800013eb6e54d3bf5289eded40da583c WHIRLPOOL e3f8999f9acdac94c71d96add6f39a4abd09b008efda15486ad43dca409bd8d7c491b41b0e19cb48cac065dccd028ff1d1a45da24acf401f8d2a5f628ef28d0d
 MISC metadata.xml 357 SHA256 a2647e7da84f83c2e137155a94ad577f471344483b3a2bce4431ec01b31b0404 SHA512 b18c905b59238fa3a0406d108ca7bd6c9b0b459691290e1d0a954860f264eb2450e8d6608a18019ae09c3e3e8a977cc5b7ba8e1ff007546a0f3cefcc8b2a12e9 WHIRLPOOL 5aec3aed62166e1d470bc4b7c05b14b4eaa8254adf0d541ac17ac3ebc55d1ba32f63cf726dacdc89a98082f0eb00e46a47c5e2e6c9278d88645dc8a87addcf2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDz53EACgkQknrdDGLu8JAMtAD7BRujme5TfFyae2utjmAksluo
-+AUulAMhg9G3FXxt0jsA/jNswY6CCRRDbjZMCY14/P9IiWgLYgVJ0hZCLHkvLjW2
-=o4Wm
+iF4EAREIAAYFAlEhUk4ACgkQknrdDGLu8JBq1gD/WgSPtajC6Aa2+rCaSdqk5HCJ
+TMj0BL/YfUDNbYVuH04A/iGW4RfKqGwTWt18hrwCk0ZEsyO/xJxyG+7wCD7qXUYK
+=F6q0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/batman-adv/batman-adv-2013.0.0_p20130215.ebuild b/net-misc/batman-adv/batman-adv-2013.0.0_p20130215.ebuild
new file mode 100644
index 000000000000..d7836ac8c434
--- /dev/null
+++ b/net-misc/batman-adv/batman-adv-2013.0.0_p20130215.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/batman-adv-2013.0.0_p20130215.ebuild,v 1.1 2013/02/17 21:57:32 xmw Exp $
+
+EAPI=4
+
+MY_P=${PN}-2013.0.0
+S=${WORKDIR}/${MY_P}
+CONFIG_CHECK="~!CONFIG_BATMAN_ADV"
+MODULE_NAMES="${PN}(net:${S}:${S})"
+BUILD_TARGETS="all"
+
+inherit base linux-mod
+
+DESCRIPTION="Better approach to mobile Ad-Hoc networking on layer 2 kernel module"
+HOMEPAGE="http://www.open-mesh.org/"
+SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bla dat debug"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${MY_P}-0001-fix-skb-leak-in-batadv_dat_snoop_incoming.patch
+	"${FILESDIR}"/${MY_P}-0002-check-for-more-types-of-invalid-IP-addres.patch
+	"${FILESDIR}"/${MY_P}-0003-filter-ARP-packets-with-invalid-MAC-addre.patch
+	"${FILESDIR}"/${MY_P}-0004-Fix-NULL-pointer-dereference-in-DAT-hash-.patch
+)
+
+src_compile() {
+	BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(use debug && echo y || echo n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(use bla && echo y || echo n)"
+	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_DAT=$(use dat && echo y || echo n)"
+	export BUILD_PARAMS
+	export KERNELPATH="${KERNEL_DIR}"
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc README CHANGELOG
+}
diff --git a/net-misc/batman-adv/files/batman-adv-2013.0.0-0001-fix-skb-leak-in-batadv_dat_snoop_incoming.patch b/net-misc/batman-adv/files/batman-adv-2013.0.0-0001-fix-skb-leak-in-batadv_dat_snoop_incoming.patch
new file mode 100644
index 000000000000..9f6c0ffcd086
--- /dev/null
+++ b/net-misc/batman-adv/files/batman-adv-2013.0.0-0001-fix-skb-leak-in-batadv_dat_snoop_incoming.patch
@@ -0,0 +1,33 @@
+From 977d8c6f9253ad71e4bd8e4be2705c3bee684feb Mon Sep 17 00:00:00 2001
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Wed, 23 Jan 2013 18:11:53 +0100
+Subject: [PATCH 1/4] batman-adv: fix skb leak in
+ batadv_dat_snoop_incoming_arp_reply()
+
+The callers of batadv_dat_snoop_incoming_arp_reply() assume the skb has been
+freed when it returns true; fix this by calling kfree_skb before returning as
+it is done in batadv_dat_snoop_incoming_arp_request().
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
+Acked-by: Antonio Quartulli <ordex@autistici.org>
+---
+ distributed-arp-table.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/distributed-arp-table.c b/distributed-arp-table.c
+index 7485a78..9f4cff3 100644
+--- a/distributed-arp-table.c
++++ b/distributed-arp-table.c
+@@ -1012,6 +1012,8 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
+ 	 */
+ 	ret = !batadv_is_my_client(bat_priv, hw_dst);
+ out:
++	if (ret)
++		kfree_skb(skb);
+ 	/* if ret == false -> packet has to be delivered to the interface */
+ 	return ret;
+ }
+-- 
+1.8.1.2
+
diff --git a/net-misc/batman-adv/files/batman-adv-2013.0.0-0002-check-for-more-types-of-invalid-IP-addres.patch b/net-misc/batman-adv/files/batman-adv-2013.0.0-0002-check-for-more-types-of-invalid-IP-addres.patch
new file mode 100644
index 000000000000..4829491a491d
--- /dev/null
+++ b/net-misc/batman-adv/files/batman-adv-2013.0.0-0002-check-for-more-types-of-invalid-IP-addres.patch
@@ -0,0 +1,36 @@
+From 3b24193d7cfc18f0cc005811ca4aab3479c2f1c6 Mon Sep 17 00:00:00 2001
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Thu, 24 Jan 2013 18:18:26 +0100
+Subject: [PATCH 2/4] batman-adv: check for more types of invalid IP addresses
+ in DAT
+
+There are more types of IP addresses that may appear in ARP packets that we
+don't want to process. While some of these should never appear in sane ARP
+packets, a 0.0.0.0 source is used for duplicate address detection and thus seen
+quite often.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+Acked-by: Antonio Quartulli <ordex@autistici.org>
+Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
+---
+ distributed-arp-table.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/distributed-arp-table.c b/distributed-arp-table.c
+index 9f4cff3..be3be28 100644
+--- a/distributed-arp-table.c
++++ b/distributed-arp-table.c
+@@ -777,7 +777,9 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv,
+ 	ip_src = batadv_arp_ip_src(skb, hdr_size);
+ 	ip_dst = batadv_arp_ip_dst(skb, hdr_size);
+ 	if (ipv4_is_loopback(ip_src) || ipv4_is_multicast(ip_src) ||
+-	    ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst))
++	    ipv4_is_loopback(ip_dst) || ipv4_is_multicast(ip_dst) ||
++	    ipv4_is_zeronet(ip_src) || ipv4_is_lbcast(ip_src) ||
++	    ipv4_is_zeronet(ip_dst) || ipv4_is_lbcast(ip_dst))
+ 		goto out;
+ 
+ 	type = ntohs(arphdr->ar_op);
+-- 
+1.8.1.2
+
diff --git a/net-misc/batman-adv/files/batman-adv-2013.0.0-0003-filter-ARP-packets-with-invalid-MAC-addre.patch b/net-misc/batman-adv/files/batman-adv-2013.0.0-0003-filter-ARP-packets-with-invalid-MAC-addre.patch
new file mode 100644
index 000000000000..e3cc165f24af
--- /dev/null
+++ b/net-misc/batman-adv/files/batman-adv-2013.0.0-0003-filter-ARP-packets-with-invalid-MAC-addre.patch
@@ -0,0 +1,51 @@
+From ab361a9ccc584e7501c06bfe1c00cb0411feebaf Mon Sep 17 00:00:00 2001
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Thu, 24 Jan 2013 18:18:27 +0100
+Subject: [PATCH 3/4] batman-adv: filter ARP packets with invalid MAC addresses
+ in DAT
+
+We never want multicast MAC addresses in the Distributed ARP Table, so it's
+best to completely ignore ARP packets containing them where we expect unicast
+addresses.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+Acked-by: Antonio Quartulli <ordex@autistici.org>
+Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
+---
+ distributed-arp-table.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/distributed-arp-table.c b/distributed-arp-table.c
+index be3be28..ea0bd31 100644
+--- a/distributed-arp-table.c
++++ b/distributed-arp-table.c
+@@ -738,6 +738,7 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv,
+ 	struct arphdr *arphdr;
+ 	struct ethhdr *ethhdr;
+ 	__be32 ip_src, ip_dst;
++	uint8_t *hw_src, *hw_dst;
+ 	uint16_t type = 0;
+ 
+ 	/* pull the ethernet header */
+@@ -782,6 +783,18 @@ static uint16_t batadv_arp_get_type(struct batadv_priv *bat_priv,
+ 	    ipv4_is_zeronet(ip_dst) || ipv4_is_lbcast(ip_dst))
+ 		goto out;
+ 
++	hw_src = batadv_arp_hw_src(skb, hdr_size);
++	if (is_zero_ether_addr(hw_src) || is_multicast_ether_addr(hw_src))
++		goto out;
++
++	/* we don't care about the destination MAC address in ARP requests */
++	if (arphdr->ar_op != htons(ARPOP_REQUEST)) {
++		hw_dst = batadv_arp_hw_dst(skb, hdr_size);
++		if (is_zero_ether_addr(hw_dst) ||
++		    is_multicast_ether_addr(hw_dst))
++			goto out;
++	}
++
+ 	type = ntohs(arphdr->ar_op);
+ out:
+ 	return type;
+-- 
+1.8.1.2
+
diff --git a/net-misc/batman-adv/files/batman-adv-2013.0.0-0004-Fix-NULL-pointer-dereference-in-DAT-hash-.patch b/net-misc/batman-adv/files/batman-adv-2013.0.0-0004-Fix-NULL-pointer-dereference-in-DAT-hash-.patch
new file mode 100644
index 000000000000..bdd4bd4cd29f
--- /dev/null
+++ b/net-misc/batman-adv/files/batman-adv-2013.0.0-0004-Fix-NULL-pointer-dereference-in-DAT-hash-.patch
@@ -0,0 +1,38 @@
+From 9f1fb6914d66e282c2b1f51aa2d4a231c84df84d Mon Sep 17 00:00:00 2001
+From: Pau Koning <paukoning@gmail.com>
+Date: Fri, 15 Feb 2013 00:18:56 +0100
+Subject: [PATCH 4/4] batman-adv: Fix NULL pointer dereference in DAT hash
+ collision avoidance
+
+An entry in DAT with the hashed position of 0 can cause a NULL pointer
+dereference when the first entry is checked by batadv_choose_next_candidate.
+This first candidate automatically has the max value of 0 and the max_orig_node
+of NULL. Not checking max_orig_node for NULL in batadv_is_orig_node_eligible
+will lead to a NULL pointer dereference when checking for the lowest address.
+
+This problem was added in 785ea1144182c341b8b85b0f8180291839d176a8
+("batman-adv: Distributed ARP Table - create DHT helper functions").
+
+Signed-off-by: Pau Koning <paukoning@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
+---
+ distributed-arp-table.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/distributed-arp-table.c b/distributed-arp-table.c
+index ea0bd31..761a590 100644
+--- a/distributed-arp-table.c
++++ b/distributed-arp-table.c
+@@ -440,7 +440,7 @@ static bool batadv_is_orig_node_eligible(struct batadv_dat_candidate *res,
+ 	/* this is an hash collision with the temporary selected node. Choose
+ 	 * the one with the lowest address
+ 	 */
+-	if ((tmp_max == max) &&
++	if ((tmp_max == max) && max_orig_node &&
+ 	    (batadv_compare_eth(candidate->orig, max_orig_node->orig) > 0))
+ 		goto out;
+ 
+-- 
+1.8.1.2
+