From patchwork Tue Oct 15 14:29:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kelleter=2C_G=C3=BCnther?= X-Patchwork-Id: 283650 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 206F02C0199 for ; Wed, 16 Oct 2013 01:37:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759274Ab3JOOh0 (ORCPT ); Tue, 15 Oct 2013 10:37:26 -0400 Received: from mailrelay-out2.netcologne.de ([81.173.193.132]:27183 "EHLO mailrelay-out2.netcologne.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759126Ab3JOOhZ convert rfc822-to-8bit (ORCPT ); Tue, 15 Oct 2013 10:37:25 -0400 X-Greylist: delayed 486 seconds by postgrey-1.27 at vger.kernel.org; Tue, 15 Oct 2013 10:37:25 EDT Received: from localhost (localhost [127.0.0.1]) by mailrelay-out2.netcologne.de (Postfix) with ESMTP id 67A0C10B3CC; Tue, 15 Oct 2013 16:29:15 +0200 (CEST) Received: from [213.168.66.18] (helo=mailrelay-out2.netcologne.de) by localhost with ESMTP (eXpurgate 4.0.0) (envelope-from ) id 525d513b-0593-7f0000012729-7f00000198c4-1 for ; Tue, 15 Oct 2013 16:29:15 +0200 Received: from remote.datus.com (unknown [213.168.66.18]) by mailrelay-out2.netcologne.de (Postfix) with ESMTP; Tue, 15 Oct 2013 16:29:08 +0200 (CEST) Received: from SBS-MAIL.datus.local ([fe80::1863:e784:733a:9d71]) by SBS-MAIL.datus.local ([fe80::1863:e784:733a:9d71%13]) with mapi id 14.01.0438.000; Tue, 15 Oct 2013 16:29:07 +0200 From: =?iso-8859-15?Q?Kelleter=2C_G=FCnther?= To: "andrew.hendry@gmail.com" CC: "davem@davemloft.net" , "linux-x25@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH] X.25: Fix address field length calculation Thread-Topic: [PATCH] X.25: Fix address field length calculation Thread-Index: AQHOybLnty+s/FnB5kKUVGTJOhUv6w== Date: Tue, 15 Oct 2013 14:29:06 +0000 Message-ID: <525D5131.9070007@datus.com> Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.52.21.9] Content-ID: <01736E88829C1B4A9589D66039BC9A5E@datus.local> MIME-Version: 1.0 X-purgate-ID: 153929::1381847355-00000593-E31637E5/0-0/0-0 X-purgate: clean Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Addresses are BCD encoded, not ASCII. x25_addr_ntoa got it right. Signed-off-by: Guenther Kelleter --- Wrong length calculation leads to rejection of CALL ACCEPT packets. net/x25/af_x25.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in