diff options
| author | Martin Schiller <ms@dev.tdt.de> | 2018-11-27 09:50:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-17 20:38:24 +0100 |
| commit | fdda36a1dd007f0bbfccc1f3f4b71a4d5a5e0ced (patch) | |
| tree | fa3baa6696ab43c07d5752e2acb7637bf6571232 | |
| parent | 2fe0edbd6f53f186cfbf85cc7b2c5e28fb9bfd53 (diff) | |
| download | linux-stable-fdda36a1dd007f0bbfccc1f3f4b71a4d5a5e0ced.tar.gz linux-stable-fdda36a1dd007f0bbfccc1f3f4b71a4d5a5e0ced.tar.bz2 linux-stable-fdda36a1dd007f0bbfccc1f3f4b71a4d5a5e0ced.zip | |
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>
| -rw-r--r-- | net/x25/af_x25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 1b830a6ee3ff..6e7ad4c6f83c 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 |