summaryrefslogtreecommitdiffstats
path: root/net/x25/af_x25.c
diff options
context:
space:
mode:
authorMartin Schiller <ms@dev.tdt.de>2018-11-27 09:50:27 +0100
committerDavid S. Miller <davem@davemloft.net>2018-11-29 14:25:36 -0800
commitd449ba3d581ed29f751a59792fdc775572c66904 (patch)
tree4ca63c8cfc5da2b74cac40c5b22b93b077c37670 /net/x25/af_x25.c
parent90230968f102acbe103fbf7c03d41addfef5f153 (diff)
downloadlinux-d449ba3d581ed29f751a59792fdc775572c66904.tar.bz2
net/x25: fix called/calling length calculation in x25_parse_address_block
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>
Diffstat (limited to 'net/x25/af_x25.c')
-rw-r--r--net/x25/af_x25.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index d49aa79b7997..5226a7f43050 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