From patchwork Wed Mar 1 14:33:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 734249 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 3vYHxl04DVz9s7p for ; Thu, 2 Mar 2017 01:33:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751907AbdCAOdg (ORCPT ); Wed, 1 Mar 2017 09:33:36 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:12204 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751542AbdCAOdd (ORCPT ); Wed, 1 Mar 2017 09:33:33 -0500 Received: from localhost (unknown [192.168.12.234]) by localhost (Postfix) with ESMTP id 3vYHxM0LlBz9ttCC; Wed, 1 Mar 2017 15:33:27 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id UygMkkOPrwLS; Wed, 1 Mar 2017 15:33:26 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 3vYHxL6hBYz9ttBs; Wed, 1 Mar 2017 15:33:26 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id AE5E28B84D; Wed, 1 Mar 2017 15:33:27 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id GsRpUGO9-w9Q; Wed, 1 Mar 2017 15:33:27 +0100 (CET) Received: from PO15451.localdomain (po15451.idsi0.si.c-s.fr [172.25.231.2]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 827B18B81E; Wed, 1 Mar 2017 15:33:27 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 2C90B6BD30; Wed, 1 Mar 2017 15:33:26 +0100 (CET) From: Christophe Leroy Subject: [PATCH] netfilter: nf_conntrack_sip: fix wrong memory initialisation To: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Gao Feng Cc: linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, stable@vger.kernel.org Message-Id: <20170301143327.2C90B6BD30@localhost.localdomain> Date: Wed, 1 Mar 2017 15:33:26 +0100 (CET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In commit 82de0be6862cd ("netfilter: Add helper array register/unregister functions"), struct nf_conntrack_helper sip[MAX_PORTS][4] was changed to sip[MAX_PORTS * 4], so the memory init should have been changed to memset(&sip[4 * i], 0, 4 * sizeof(sip[i])); But as the sip[] table is allocated in the BSS, it is already set to 0 Fixes: 82de0be6862cd ("netfilter: Add helper array register/unregister functions") Cc: stable@vger.kernel.org Signed-off-by: Christophe Leroy --- net/netfilter/nf_conntrack_sip.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 24174c520239..0d17894798b5 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c @@ -1628,8 +1628,6 @@ static int __init nf_conntrack_sip_init(void) ports[ports_c++] = SIP_PORT; for (i = 0; i < ports_c; i++) { - memset(&sip[i], 0, sizeof(sip[i])); - nf_ct_helper_init(&sip[4 * i], AF_INET, IPPROTO_UDP, "sip", SIP_PORT, ports[i], i, sip_exp_policy, SIP_EXPECT_MAX,