-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2

-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/ChangeLog,v 1.15 2013/11/24 22:57:51 xmw Exp $

-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-2013.0.0.tar.gz 114111 SHA256 af51410ae0e4e87a43bc6897d65cdb41fc9bb75033e65ea03c54e868acdb8435 SHA512 a0ad35267366f64b7768819e222c0653ccf2e915d05e6718cd49e0939003c2204ebf166d3d01bc286e869cc1d84c3cbb5e7760b6579283f5e02a47601d272d4f WHIRLPOOL c23c64097e15f33faffd1c50c38f9b77d893a6accb410ac07b9f4f60f129aff35e39e6238007da967f54fa6dc9af45b8993f1dfbe9a9e7955755bcb57b0e2ac5

-DIST batman-adv-2013.1.0.tar.gz 118806 SHA256 4dbc2050b14c35d7a2907ce574030b070f6d89a54a1997561bd1b849a3e6c445 SHA512 0f5c7e25ba7b43c352d5e0d8f4ae605af2d199ddce6535d76934e129e1b3bf314a5ed5c778f1912ce06e2599ae6618f8913220c5cbd678c20f8b11a5abd57cdb WHIRLPOOL 0b7be490f8acef86e99ee03dd6e4e3ab9b5a52fa6e929c9add64dfdb2c9041a28ef2a6e61d0a4a9bded294317689e66822feb4ef4745553bfeab284b27d3a944

-DIST batman-adv-2013.2.0.tar.gz 135929 SHA256 0eda171033434cc7971c1d44e3156f2b11984ba9231d6e85ef27ac3548eb41f0 SHA512 307ea4e07e3787a3fbbd71cd93b3ebc0680507b48e7ada915a1761fa9f008fe9566e738a33481c53f5c5324942e39255830fb97e73e3f2f7b94ea145710a8cea WHIRLPOOL 30705bd5720aebf0c240d04075d106db8854deb8e3fae8799ab3831a9687eaac338e084e11bdd1de374a5050a01bc05e2dd0066878dfdbf2a609f5632a1a9375

-DIST batman-adv-2013.3.0.tar.gz 137784 SHA256 35d5b66c8ce186dd6fce3aa4677a5d127221edbad9c5e361dbf98609a11b1a7a SHA512 ded7cbb76d6633168e878131d73ad3033bb0dcb01d0f30cf2bfcc75259d1289c82e6ae93cbce3028cd785b8363cbee1f28ebf91cce487966ad0f96ccd067a2ce WHIRLPOOL 06a7e9ab639d72f39618ce58265338eaab498f800c0228ed6b90b1e55306fe0603132c5657d99c68545e0906e09bca34ff865f394fbdb080dce3cfa8f2fea8d0

-EBUILD batman-adv-2013.0.0_p20130215.ebuild 1393 SHA256 b23fe3f18df7ef4846e9d9c2959f32e7ca18e211ae9dcfa222f2f148f9224132 SHA512 7e48bf380bc7299c952b3466aeeb80695471b5456cffdf5ad3377734d69b69e93ee6d73ee7def512f4364fc7fa274327b5654381083c6cfd9d66954b0b0a9e91 WHIRLPOOL 400ab90acdf8863d828d8e48fb7a8c6d80ae46c2e2d48c475a65f84d27d0e1fd0a8c0b0be8cbd649ec5f12f16cfe56989053030f69cd91cb0d1b979188715c37

-EBUILD batman-adv-2013.1.0.ebuild 1017 SHA256 e4d74aaf310319193d16a51cd5262732cf51355d856fc6320302584e1a6e3004 SHA512 f6576107270f8201be782f023d7c6709b98826e451e72295a320a1a8281a076a16194096ce3c9b713e7b8f647e85043ca0911ebf06beb98be338d2d6a953a22e WHIRLPOOL ec317f983afc57565817594f6a7a0dbc1766704571a8f7107e5ab04365ebf25825af4f740354bd4800d3335ec27a9f6af383d9424e4ff68d67a3a987f25311ea

-EBUILD batman-adv-2013.2.0.ebuild 1036 SHA256 30c52dfd6b1a53345eba5b74d0ff9221880c81b039bcbf2e7b34939b6a90fdea SHA512 05e47efdad213fef8d7a7b6b38695bc16f2665efe6bf4df0f8f6de37c1dd4b463cce27212ac2ac6621b626c120881667704d04499b4d665c2753931562acfef2 WHIRLPOOL 4c3865e181bca1daa3a18ef8d8bbdb188961c5717667e4438b69202f41fbf134a98db1b33e452807c3079fc158c44949a08519df161ec03b7baf3cea656c24ce

-EBUILD batman-adv-2013.3.0.ebuild 1036 SHA256 db21513330a4390af166c5e7dbf4a2bbd518ed345ec1537cc0a574af78fac146 SHA512 73dbbc3c24243ef352649471c8d5cfa852d1171bb47e4f6e7863f58ba08b267c943c9b788a2181d4db5476b8c4bae15b9083cfb6166d4f5c1b584d5e32e3d313 WHIRLPOOL 4f6b7a49bec292450c31ee0c57da5f1c7a7426ee8044f7dd54ea65939d61bad6126c784f6b8d3e526b2ea8162e91ad59cb625c7e3fe2ee121ef33ccc82547e87

-MISC ChangeLog 3290 SHA256 85dcc865dd29f0f1db1aba317680a526b607af12331284d49f8ba80088144def SHA512 fb57b3cd872714d4894040dca34066226e17bb986faf7ef1b844bbbd44a2d0ff51fa2319d5b6f042bc7ceeedc16d4892e930a74b964a682e02054f11eb653030 WHIRLPOOL 6917cac4924d5c0f9ed577b8f3d09ea806322d01a95f4b9a24215c01967715e4afb5a1354f6b60ff82789d18556818a8ae5ba18ae68c6404856fa72506406abe

-MISC metadata.xml 409 SHA256 16ed48b47a392c9b3e4aaef66bfde57333b9f1e51eaafa5f6b8846d756d70d04 SHA512 c2346ea249e6955c6c3824d5d759671b4c16e21fd570e5bce95a78c18e0c0f0567ace9847f23333c5c2f18bd0a0a782d770541e1c90ef44d026324669ded01fd WHIRLPOOL 5ca0d45fc0e7010ba25cf3b9fa4c4a1b80a01b906585851254090f02c753effd1f1b8b67db933dcbdd6daeef3cc0190e80208573c3e50261599a1a15106ee221

-Version: GnuPG v2.0.22 (GNU/Linux)

-iF4EAREIAAYFAlKShH0ACgkQknrdDGLu8JDV1AEAibGWkTnWMixmfKiDmSTBYjT2

-qN9GSqhEyNyAll2wI3IBAJSM4e/JsnA9PgDCHpMR6dS7zdnxl47Wn6iwlmAoedoU

-=i/ry

-# 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

-}

-# 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.1.0.ebuild,v 1.1 2013/03/13 13:25:35 xmw Exp $

-

-EAPI=4

-

-CONFIG_CHECK="~!CONFIG_BATMAN_ADV"

-MODULE_NAMES="${PN}(net:${S}:${S})"

-BUILD_TARGETS="all"

-

-inherit 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}/${P}.tar.gz"

-

-LICENSE="GPL-2"

-SLOT="0"

-KEYWORDS="~amd64 ~x86"

-IUSE="bla dat debug"

-

-DEPEND=""

-RDEPEND=""

-

-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

-}

-# 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.3.0.ebuild,v 1.1 2013/08/05 05:43:58 xmw Exp $

-

-EAPI=4

-

-CONFIG_CHECK="~!CONFIG_BATMAN_ADV"

-MODULE_NAMES="${PN}(net:${S}:${S})"

-BUILD_TARGETS="all"

-

-inherit eutils 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}/${P}.tar.gz"

-

-LICENSE="GPL-2"

-SLOT="0"

-KEYWORDS="~amd64 ~x86"

-IUSE="bla dat debug nc"

-

-DEPEND=""

-RDEPEND=""

-

-src_compile() {

- BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(usex debug y n)"

- BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(usex bla y n)"

- BUILD_PARAMS+=" CONFIG_BATMAN_ADV_DAT=$(usex dat y n)"

- BUILD_PARAMS+=" CONFIG_BATMAN_ADV_NC=$(usex nc y n)"

- export BUILD_PARAMS

- export KERNELPATH="${KERNEL_DIR}"

- linux-mod_src_compile

-}

-

-src_install() {

- linux-mod_src_install

- dodoc README CHANGELOG

-}

-# Copyright 1999-2013 Gentoo Foundation

-# $Header: /var/cvsroot/gentoo-x86/net-misc/batman-adv/batman-adv-2013.2.0.ebuild,v 1.1 2013/04/22 06:25:33 xmw Exp $

-CONFIG_CHECK="~!CONFIG_BATMAN_ADV"

-IUSE="bla dat debug nc"

-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

-

-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

-

-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

-

-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

-