Repository : ssh://git@open-mesh.org/batman-adv

On branches: maint,master

commit e45a75c82feae23a20d2744ccfde03780ccdafc7 Author: Sven Eckelmann sven.eckelmann@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: 4f241fcea704 ("batman-adv: Include frame priority in fragment header") Signed-off-by: Sven Eckelmann sven.eckelmann@open-mesh.com

e45a75c82feae23a20d2744ccfde03780ccdafc7 net/batman-adv/fragmentation.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index a98cf110..ebe6e389 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);