[linux-next] LinuxNextTracking branch, master, updated. next-20171218

batman at open-mesh.org batman at open-mesh.org
Tue Dec 19 00:16:36 CET 2017

The following commit has been merged in the master branch:
commit fe77d8257c4d838c5976557ddb87bd789f312412
Author: Sven Eckelmann <sven.eckelmann at open-mesh.com>
Date:   Wed Nov 29 10:25:02 2017 +0100

    batman-adv: Always initialize fragment header priority
    The batman-adv unuicast fragment header contains 3 bits for the priority of
    the packet. These bits will be initialized when the skb->priority contains
    a value between 256 and 263. But otherwise, the uninitialized bits from the
    stack will be used.
    Fixes: c0f25c802b33 ("batman-adv: Include frame priority in fragment header")
    Signed-off-by: Sven Eckelmann <sven.eckelmann at open-mesh.com>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>

diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index a98cf1104a30..ebe6e38934e4 100644
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -499,6 +499,8 @@ int batadv_frag_send_packet(struct sk_buff *skb,
 	if (skb->priority >= 256 && skb->priority <= 263)
 		frag_header.priority = skb->priority - 256;
+	else
+		frag_header.priority = 0;
 	ether_addr_copy(frag_header.orig, primary_if->net_dev->dev_addr);
 	ether_addr_copy(frag_header.dest, orig_node->orig);


More information about the linux-merge mailing list