From patchwork Tue May 22 06:00:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagdish Motwani X-Patchwork-Id: 160542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 87EFDB6F77 for ; Tue, 22 May 2012 16:02:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751498Ab2EVGCS (ORCPT ); Tue, 22 May 2012 02:02:18 -0400 Received: from mailhost.elitecore.com ([203.88.135.194]:41414 "EHLO elitecore.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751014Ab2EVGCR (ORCPT ); Tue, 22 May 2012 02:02:17 -0400 X-Greylist: delayed 442 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 May 2012 02:02:16 EDT Received: (qmail 26316 invoked from network); 22 May 2012 05:54:49 -0000 Received: from ice.140.client119.youtele.com (HELO [10.103.6.186]) (jagdish.motwani@[203.88.140.119]) (envelope-sender ) by elitecore.com (qmail-ldap-1.03) with SMTP for ; 22 May 2012 05:54:49 -0000 Message-ID: <4FBB2B7B.6060907@elitecore.com> Date: Tue, 22 May 2012 11:30:27 +0530 From: Jagdish Motwani User-Agent: Mozilla/5.0 (X11; Linux i686; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: 'Patrick McHardy' CC: netfilter-devel@vger.kernel.org Subject: [PATCH] netfilter conntrack helper: nf_ct_h323: fix bug in rtcp natting X-Cyberoam-smtpxy-version: 1.0.6.3 X-Cyberoam-AV-Policy: default X-CTCH-Error: Unable to connect local ctasd X-Cyberoam-smtpxy-version: 1.0.6.3 X-Cyberoam-AV-Policy: Default Rule Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The nat_rtp_rtcp hook takes two separate parameters port and rtp_port. port is expected to be the real h245 address(found inside the packet). rtp_port is the even number closest to port (RTP ports are even and RTCP ports are odd) However currently, both port and rtp_port are having same value(both are rounded to nearest even numbers). This works well in case of openlogicalchannel with media (RTP/even) port. But in case of openlogicalchannel for media control (RTCP/odd) port, h245 address in the packet is wrongly modified to have an even port. I am attaching a pcap demonstrating the problem, for any further analysis. This behavior was introduced around v2.6.19 while rewriting the helper. Signed-off-by: Jagdish Motwani Signed-off-by: Sanket Shah --- if ((rtp_exp = nf_ct_expect_alloc(ct)) == NULL) diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index 46d69d7..7f0de36 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -270,9 +270,8 @@ static int expect_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct, return 0; /* RTP port is even */ - port &= htons(~1); - rtp_port = port; - rtcp_port = htons(ntohs(port) + 1); + rtp_port = port & htons(~1); + rtcp_port = htons(ntohs(rtp_port) + 1); /* Create expect for RTP */