From: Martin Schiller <ms@dev.tdt.de>
Date: Tue, 27 Nov 2018 08:50:27 +0000 (+0100)
Subject: net/x25: fix called/calling length calculation in x25_parse_address_block
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ad4c756c9d999ac63567cec9f6bd7283d2dca159;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

net/x25: fix called/calling length calculation in x25_parse_address_block

[ Upstream commit d449ba3d581ed29f751a59792fdc775572c66904 ]

The length of the called and calling address was not calculated
correctly (BCD encoding).

Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 770ababb8f92..ebd9c5f50a57 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -100,7 +100,7 @@ int x25_parse_address_block(struct sk_buff *skb,
 	}
 
 	len = *skb->data;
-	needed = 1 + (len >> 4) + (len & 0x0f);
+	needed = 1 + ((len >> 4) + (len & 0x0f) + 1) / 2;
 
 	if (!pskb_may_pull(skb, needed)) {
 		/* packet is too short to hold the addresses it claims