From patchwork Wed Nov 29 09:25:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17164 X-Patchwork-Delegate: sven@narfation.org Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 2C70A804C2; Wed, 29 Nov 2017 10:25:12 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=openmesh-com.20150623.gappssmtp.com header.i=@openmesh-com.20150623.gappssmtp.com header.b="gG/Ljm+c"; dkim-atps=neutral Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2607:f8b0:400d:c0d::242; helo=mail-qt0-x242.google.com; envelope-from=sven.eckelmann@openmesh.com; receiver= Received: from mail-qt0-x242.google.com (mail-qt0-x242.google.com [IPv6:2607:f8b0:400d:c0d::242]) by open-mesh.org (Postfix) with ESMTPS id 1CE31801A1 for ; Wed, 29 Nov 2017 10:25:09 +0100 (CET) Received: by mail-qt0-x242.google.com with SMTP id j5so3424849qth.11 for ; Wed, 29 Nov 2017 01:25:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openmesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=kTj4BWGk/dIlWYxPsHw6BEqaHiP3bn0Ga0Z+xl8WL+g=; b=gG/Ljm+ceZiLuSNzdfXh9accOgxujQbYr3ZHzKutewIbDbcjVKHssEmLbw9hn9OCDl VJjYam3RYSTnXPzJNLZHmj89DlPmquWi/8rF2boDiN4O7N70tgA1S9RCNmGhAOwzKCBK 9NZw7pjVRM6iNkuynoXlUua2D1zyHaSMsT7Oau/4X05zQzNt2KCAtyMVSnZiBODSkXZm IqnlRoM95pBjJ7TrkWtyUSxOmU0lbGmse2KC30DihA9e8hcfs2TZPna8lc7RORxmCKHX xov7EDCMMV4REy4u2c7rAIU38I3JGeKwIaDnA81KjVGPTiVMn3s1p+ko8DcArEI7AGvG FpKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kTj4BWGk/dIlWYxPsHw6BEqaHiP3bn0Ga0Z+xl8WL+g=; b=ZVy0TGlP3rZrj/kaNSNZ4FIe40Rh6rQwaHg1dATDqGC6U3kA/lNmBSSUBr2KzrkbTf Sy45dtq51O386bDNhusitqs+TvAI6A0iQpzJHHE2LRZAvRHaUepFDXaQGkkST/Nn6TEL AMBisRrXEZaB9P646BqMed+242KFq7JYexK+he9nKokJjOYYLrgzJTz8+qxI3tFuzayt uBG4HDbulUaf//lLnF0wQRtVD/a3rBeK3uI/NTqD8OD3MPwD8hIeH6jqvidwPFn9W0Tx 0En6Xzm0HdsA0uCi9JK31S1ByiqPJXnkVD8MnkYad8IxYkiIw0qHuqMcJgS+2/HOuPg3 BH4g== X-Gm-Message-State: AJaThX5JcqbED+x2+89DcKygPwLYHQYfNGRmIxVtlTyRXlpMAO06HiC3 AZ/uJWTYp53bQLtR8jF5IvC83ye0 X-Google-Smtp-Source: AGs4zMYsY9JBOHDs1meW8OHF+Y7tzO+PkZIrIKG3jQQ61/x19DdkrWy2StMPCyLA+FFi6kJtOuLufA== X-Received: by 10.200.41.249 with SMTP id 54mr3507742qtt.312.1511947508675; Wed, 29 Nov 2017 01:25:08 -0800 (PST) Received: from sven-desktop.home.narfation.org (p549BDDB2.dip0.t-ipconnect.de. [84.155.221.178]) by smtp.gmail.com with ESMTPSA id m129sm868434qkf.27.2017.11.29.01.25.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Nov 2017 01:25:07 -0800 (PST) From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 29 Nov 2017 10:25:02 +0100 Message-Id: <20171129092502.10474-1-sven.eckelmann@openmesh.com> X-Mailer: git-send-email 2.11.0 Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: Always initialize fragment header priority X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Cc: Sven Eckelmann Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" From: Sven Eckelmann 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 --- Cc: Andrew Lunn --- 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 a98cf1104a30a30e66fb6018bef59dea83dc4b7a..ebe6e38934e46ed5de4d30204e791dbe40285fcc 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);