From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo Neira Ayuso Subject: Re: [PATCH nf-next 1/4] netfilter: amanda: Correct the return value comparison of the func nf_nat_mangle_udp_packet Date: Mon, 27 Mar 2017 14:12:32 +0200 Message-ID: <20170327121232.GA15713@salvia> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netfilter-devel@vger.kernel.org, gfree.wind@gmail.com To: fgao@ikuai8.com Return-path: Received: from mail.us.es ([193.147.175.20]:52472 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751751AbdC0MMu (ORCPT ); Mon, 27 Mar 2017 08:12:50 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 26ABEEAA7E for ; Mon, 27 Mar 2017 14:12:46 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id DF933DA874 for ; Mon, 27 Mar 2017 14:12:45 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id F0E68DA863 for ; Mon, 27 Mar 2017 14:12:37 +0200 (CEST) Content-Disposition: inline In-Reply-To: Sender: netfilter-devel-owner@vger.kernel.org List-ID: On Fri, Mar 17, 2017 at 02:47:19PM +0800, fgao@ikuai8.com wrote: > From: Gao Feng > > The return value of nf_nat_mangle_udp_packet actually is 1 and 0 as > bool type. But the amanda codes compare it with NF_ACCEPT. > > Signed-off-by: Gao Feng > --- > net/netfilter/nf_nat_amanda.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c > index eb77238..e4d61a7 100644 > --- a/net/netfilter/nf_nat_amanda.c > +++ b/net/netfilter/nf_nat_amanda.c > @@ -33,7 +33,6 @@ static unsigned int help(struct sk_buff *skb, > { > char buffer[sizeof("65535")]; > u_int16_t port; > - unsigned int ret; > > /* Connection comes from client. */ > exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port; > @@ -63,14 +62,14 @@ static unsigned int help(struct sk_buff *skb, > } > > sprintf(buffer, "%u", port); > - ret = nf_nat_mangle_udp_packet(skb, exp->master, ctinfo, > - protoff, matchoff, matchlen, > - buffer, strlen(buffer)); > - if (ret != NF_ACCEPT) { > + if (!nf_nat_mangle_udp_packet(skb, exp->master, ctinfo, > + protoff, matchoff, matchlen, > + buffer, strlen(buffer))) { > nf_ct_helper_log(skb, exp->master, "cannot mangle packet"); > nf_ct_unexpect_related(exp); > + return NF_DROP; > } > - return ret; > + return NF_ACCEPT; This cleanup patches are a bit oversplit. Better, send one patch where you update nf_nat_mangle_udp_packet() and nf_nat_mangle_tcp_packet() to return boolean and update *all of the netfilter spots* where we use them accordingly. Please be careful on this...