From patchwork Sun Nov 14 06:35:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 71089 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 1D56DB7125 for ; Sun, 14 Nov 2010 17:36:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753419Ab0KNGgm (ORCPT ); Sun, 14 Nov 2010 01:36:42 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:39560 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753262Ab0KNGgl (ORCPT ); Sun, 14 Nov 2010 01:36:41 -0500 Received: by iwn10 with SMTP id 10so5314434iwn.19 for ; Sat, 13 Nov 2010 22:36:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=V4tZsCGuKX4ZKZT23DsCMS/3i9p/jUrvtrnKwaZVFNw=; b=c368I8kxpXjEP6Pjt3cOw12fM+31r1te60r7GB8B/f2l04C4lLw+Y6KrjTwF8SByfj tGZWzjyX6g4ZRZvGlDWJjccoWlTUpiY0DQAiHNeo2w50cw2IFeB/dN8SFZg+qTV/DNQb gT8MO3v1QM5TojUkldkztunHFlNS9GwdLalIA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=dE8tTqMwqpElS8UHQ3ejFmzu7AlbgcbS2lb3OaKxPXxjveaFRi1nCBQ5qulCUAjxLR Ro63hgsoYm4WukpsSuXkVs9k4/dPyZDOIn7PlRGRJKS6of2R7h3Km10AB9JSOChlb2kk 4HdHf8SAt/WBh1nZCSaI39o7jiUJxI8q8lWqQ= Received: by 10.231.12.136 with SMTP id x8mr3427412ibx.52.1289716600365; Sat, 13 Nov 2010 22:36:40 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id fw4sm5791480ibb.13.2010.11.13.22.36.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 13 Nov 2010 22:36:38 -0800 (PST) From: Changli Gao To: Patrick McHardy Cc: "David S. Miller" , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, Changli Gao Subject: [PATCH] netfilter: fix the wrong alloc_size Date: Sun, 14 Nov 2010 14:35:48 +0800 Message-Id: <1289716548-30767-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In function update_alloc_size(), sizeof(struct nf_ct_ext) is added twice wrongly. Signed-off-by: Changli Gao --- net/netfilter/nf_conntrack_extend.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/netfilter/nf_conntrack_extend.c b/net/netfilter/nf_conntrack_extend.c index bd82450..920f924 100644 --- a/net/netfilter/nf_conntrack_extend.c +++ b/net/netfilter/nf_conntrack_extend.c @@ -144,9 +144,8 @@ static void update_alloc_size(struct nf_ct_ext_type *type) if (!t1) continue; - t1->alloc_size = sizeof(struct nf_ct_ext) - + ALIGN(sizeof(struct nf_ct_ext), t1->align) - + t1->len; + t1->alloc_size = ALIGN(sizeof(struct nf_ct_ext), t1->align) + + t1->len; for (j = 0; j < NF_CT_EXT_NUM; j++) { t2 = nf_ct_ext_types[j]; if (t2 == NULL || t2 == t1 ||