From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbcBAR7L (ORCPT ); Mon, 1 Feb 2016 12:59:11 -0500 Received: from mail.us.es ([193.147.175.20]:48627 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751572AbcBAR7J (ORCPT ); Mon, 1 Feb 2016 12:59:09 -0500 Date: Mon, 1 Feb 2016 18:58:58 +0100 From: Pablo Neira Ayuso To: Zhouyi Zhou Cc: eric.dumazet@gmail.com, kaber@trash.net, kadlec@blackhole.kfki.hu, davem@davemloft.net, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, fw@strlen.de, gnomes@lxorguk.ukuu.org.uk, sergei.shtylyov@cogentembedded.com, Zhouyi Zhou Subject: Re: [PATCH V3] netfilter: h323: avoid potential attack Message-ID: <20160201175858.GA2453@salvia> References: <1454037935-14842-1-git-send-email-zhouzhouyi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1454037935-14842-1-git-send-email-zhouzhouyi@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jan 29, 2016 at 11:25:35AM +0800, Zhouyi Zhou wrote: > I think hackers chould build a malicious h323 packet to overflow > the pointer p which will panic during the memcpy(addr, p, len) > For example, he may fabricate a very large taddr->ipAddress.ip; > As suggested by Eric, this module is protected by a lock (nf_h323_lock) > so adding a variable h323_buffer_valid_bytes that would contain > the number of valid bytes would not require to change prototypes of > get_h2x5_addr. > > Signed-off-by: Zhouyi Zhou > Signed-off-by: Eric Dumazet > Reviewed-by: Sergei Shtylyov > > --- > net/netfilter/nf_conntrack_h323_main.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c > index 9511af0..65d84bc 100644 > --- a/net/netfilter/nf_conntrack_h323_main.c > +++ b/net/netfilter/nf_conntrack_h323_main.c > @@ -110,6 +110,11 @@ int (*nat_q931_hook) (struct sk_buff *skb, > > static DEFINE_SPINLOCK(nf_h323_lock); > static char *h323_buffer; > +static unsigned int h323_buffer_valid_bytes; > +/* check offset overflow and out of range data reference */ > +#define CHECK_BOUND(p, n) ((n) > h323_buffer_valid_bytes || \ > + ((void *)(p) + (n) - (void *)h323_buffer \ > + > h323_buffer_valid_bytes)) We don't want obscure macros. You add a function for this, the compiler will likely inline it.