The following commit has been merged in the next branch: commit 4aae8042b3df7ac9a74177f799cb26186623e2e7 Author: Sven Eckelmann sven@narfation.org Date: Thu Jun 28 11:56:52 2012 +0200

batman-adv: Don't leak information through uninitialized packet fields

The reserved fields in batman-adv packets are not set to a constant value. The content of these memory regions is leaked unintentionally to the network.

This regression was introduced in c7fb529996cbc47bc8243d6860dac716ae70af82

Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/soft-interface.c b/soft-interface.c index b7c655c..9e4bb61 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -214,6 +214,7 @@ static int batadv_interface_tx(struct sk_buff *skb,

/* batman packet type: broadcast */ bcast_packet->header.packet_type = BATADV_BCAST; + bcast_packet->reserved = 0;

/* hw address of first interface is the orig mac because only * this mac is known throughout the mesh diff --git a/translation-table.c b/translation-table.c index 245cc9a..a438f4b 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2052,6 +2052,7 @@ static void batadv_send_roam_adv(struct batadv_priv *bat_priv, uint8_t *client, roam_adv_packet->header.packet_type = BATADV_ROAM_ADV; roam_adv_packet->header.version = BATADV_COMPAT_VERSION; roam_adv_packet->header.ttl = BATADV_TTL; + roam_adv_packet->reserved = 0; primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) goto out; diff --git a/vis.c b/vis.c index f09cc9a..2a2ea06 100644 --- a/vis.c +++ b/vis.c @@ -589,6 +589,7 @@ static int batadv_generate_vis_packet(struct batadv_priv *bat_priv) packet->header.ttl = BATADV_TTL; packet->seqno = htonl(ntohl(packet->seqno) + 1); packet->entries = 0; + packet->reserved = 0; skb_trim(info->skb_packet, sizeof(*packet));

if (packet->vis_type == BATADV_VIS_TYPE_CLIENT_UPDATE) { @@ -890,6 +891,7 @@ int batadv_vis_init(struct batadv_priv *bat_priv) packet->header.packet_type = BATADV_VIS; packet->header.ttl = BATADV_TTL; packet->seqno = 0; + packet->reserved = 0; packet->entries = 0;

INIT_LIST_HEAD(&bat_priv->vis_send_list);