28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
|
|
Date: Wed, 29 Nov 2017 10:25:02 +0100
|
|
Subject: 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>
|
|
|
|
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e45a75c82feae23a20d2744ccfde03780ccdafc7
|
|
|
|
diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
|
|
index 70e512111528b0345889cea4ffd0ad5d984a4e6a..28f54887c975905d03372ab8ba5274fd82117651 100644
|
|
--- a/net/batman-adv/fragmentation.c
|
|
+++ b/net/batman-adv/fragmentation.c
|
|
@@ -500,6 +500,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);
|