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-21 10:34:40 +0100 |
| commit | b8305db0552ed92313aa0eb934aafff1d9897e85 (patch) | |
| tree | dcaea702fb02626bc401f30f27ec68e3d4d79981 /net/x25 | |
| parent | 69ab25aef407ecbd137926159e8ef2456873fda4 (diff) | |
| download | linux-stable-b8305db0552ed92313aa0eb934aafff1d9897e85.tar.gz linux-stable-b8305db0552ed92313aa0eb934aafff1d9897e85.tar.bz2 linux-stable-b8305db0552ed92313aa0eb934aafff1d9897e85.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>
Diffstat (limited to 'net/x25')
| -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 5dca42dbc737..5a041ea25fe2 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 |