Skip to contentSkip to conversation

Patch "batman-adv: fix elp packet data reservation" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Oct 5, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

batman-adv: fix elp packet data reservation

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
batman-adv-fix-elp-packet-data-reservation.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 1e5d343b8f23770e8ac5d31f5c439826bdb35148 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Linus=20L=C3=BCssing?= <[email protected]>
Date: Tue, 23 Aug 2016 03:13:03 +0200
Subject: batman-adv: fix elp packet data reservation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Linus Lüssing <[email protected]>

commit 1e5d343b8f23770e8ac5d31f5c439826bdb35148 upstream.

The skb_reserve() call only reserved headroom for the mac header, but not the elp packet header itself.

Fixing this by using skb_put()'ing towards the skb tail instead of skb_push()'ing towards the skb head.

Fixes d6f94d91f766 ("batman-adv: ELP - adding basic infrastructure")
---
 net/batman-adv/bat_v_elp.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/bat_v_elp.c +1 -1
@@ -334,7 +334,7 @@ int batadv_v_elp_iface_enable(struct bat
 		goto out;
 
 	skb_reserve(hard_iface->bat_v.elp_skb, ETH_HLEN + NET_IP_ALIGN);
-	elp_buff = skb_push(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN);
+	elp_buff = skb_put(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN);
 	elp_packet = (struct batadv_elp_packet *)elp_buff;
 	memset(elp_packet, 0, BATADV_ELP_HLEN);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/batman-adv-fix-elp-packet-data-reservation.patch