From patchwork Thu Mar 14 16:03:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 227727 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 A52892C0089 for ; Fri, 15 Mar 2013 03:03:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932394Ab3CNQDd (ORCPT ); Thu, 14 Mar 2013 12:03:33 -0400 Received: from mail.us.es ([193.147.175.20]:48510 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933603Ab3CNQDc (ORCPT ); Thu, 14 Mar 2013 12:03:32 -0400 Received: (qmail 13167 invoked from network); 14 Mar 2013 17:03:31 +0100 Received: from unknown (HELO us.es) (192.168.2.13) by us.es with SMTP; 14 Mar 2013 17:03:31 +0100 Received: (qmail 16920 invoked by uid 507); 14 Mar 2013 16:03:31 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus3 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.6/16848. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-96.4/7.5):. Processed in 4.07799 secs); 14 Mar 2013 16:03:31 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus3 X-Spam-Level: X-Spam-Status: No, score=-96.4 required=7.5 tests=BAYES_50, RCVD_IN_BRBL_LASTEXT,RCVD_IN_SORBS_WEB,RCVD_IN_XBL,RDNS_NONE, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus3) (127.0.0.1) by us.es with SMTP; 14 Mar 2013 16:03:26 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus3 (F-Secure/fsigk_smtp/407/antivirus3); Thu, 14 Mar 2013 17:03:26 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus3) Received: (qmail 24903 invoked from network); 14 Mar 2013 17:03:26 +0100 Received: from unknown (HELO soleta.scandinavia.public.cabinn.com) (pneira@us.es@213.173.227.110) by us.es with SMTP; 14 Mar 2013 17:03:26 +0100 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: eric.dumazet@gmail.com Subject: [PATCH 2/2] netfilter: nfnetlink_queue: fix incorrect initialization of copy range field Date: Thu, 14 Mar 2013 17:03:18 +0100 Message-Id: <1363276999-30144-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363276999-30144-1-git-send-email-pablo@netfilter.org> References: <1363276999-30144-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Pablo Neira Ayuso 2^16 = 0xffff, not 0xfffff (note the extra 'f'). Reported-by: Eric Dumazet Signed-off-by: Pablo Neira Ayuso --- net/netfilter/nfnetlink_queue_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index 4512658..e81dad6 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -113,7 +113,7 @@ instance_create(u_int16_t queue_num, int portid) inst->queue_num = queue_num; inst->peer_portid = portid; inst->queue_maxlen = NFQNL_QMAX_DEFAULT; - inst->copy_range = 0xfffff; + inst->copy_range = 0xffff; inst->copy_mode = NFQNL_COPY_NONE; spin_lock_init(&inst->lock); INIT_LIST_HEAD(&inst->queue_list);