From: "Kelleter, Günther" <GKelleter@datus.com>
To: "andrew.hendry@gmail.com" <andrew.hendry@gmail.com>
Cc: "davem@davemloft.net" <davem@davemloft.net>,
"linux-x25@vger.kernel.org" <linux-x25@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] X.25: Fix address field length calculation
Date: Tue, 15 Oct 2013 14:29:06 +0000 [thread overview]
Message-ID: <525D5131.9070007@datus.com> (raw)
Addresses are BCD encoded, not ASCII. x25_addr_ntoa got it right.
Signed-off-by: Guenther Kelleter <gkelleter@datus.com>
---
Wrong length calculation leads to rejection of CALL ACCEPT packets.
net/x25/af_x25.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 45a3ab5..2daf224 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -98,7 +98,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
--
1.8.3.4.71.g0878476
next reply other threads:[~2013-10-15 14:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-15 14:29 Kelleter, Günther [this message]
2013-10-15 17:29 ` [PATCH] X.25: Fix address field length calculation Joe Perches
2013-10-16 6:58 ` Kelleter, Günther
2013-10-16 8:56 ` David Laight
2013-10-17 11:02 ` Andrew Hendry
2013-10-17 12:09 ` Kelleter, Günther
2013-10-17 20:04 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2013-10-18 12:03 Guenther Kelleter
2013-10-02 11:21 Kelleter, Günther
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=525D5131.9070007@datus.com \
--to=gkelleter@datus.com \
--cc=andrew.hendry@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-x25@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox