From patchwork Thu Mar 25 16:17:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 48532 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 D5383B7CB9 for ; Fri, 26 Mar 2010 03:18:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752555Ab0CYQR7 (ORCPT ); Thu, 25 Mar 2010 12:17:59 -0400 Received: from mail-bw0-f209.google.com ([209.85.218.209]:37765 "EHLO mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752192Ab0CYQR5 (ORCPT ); Thu, 25 Mar 2010 12:17:57 -0400 Received: by bwz1 with SMTP id 1so1019694bwz.21 for ; Thu, 25 Mar 2010 09:17:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=G4DaN1cqg8r5mDPpmMKPY7flhw74QEILXATeccyR1Kw=; b=LQ+lN/n5OHXsxO30mtuQjTOncy+9ahfWVO/h463USCGT7XAroWJovcSRHk7D+z7zWq xkJiojbSe+C7NJcWXDDyNNtk/76IGrZ8LpT4Ei0UpA8BmDnkWuNKvWxqnK6saMcVHWfg pCU+q2hmw9JngvaQeP8l9sgLaXsHD18kyurms= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=GPk+AQrD3dBnMhG/30wzZxPnm1Krn7gR3V/jhdNQq9Kz3Mv+2HAJGEO4Q+iOdnRGrl ZgGwil94D++an+PVtFHbBQU+7410Gztg12vqD5DfHOOPNOg5IorcFjZBAZi29nV/oNeW axDiDXD3DjDIvJoJGLkFI12XU6SwzFmTeJtjc= Received: by 10.204.34.195 with SMTP id m3mr1145262bkd.190.1269533872910; Thu, 25 Mar 2010 09:17:52 -0700 (PDT) Received: from [127.0.0.1] (gw1.cosmosbay.com [212.99.114.194]) by mx.google.com with ESMTPS id 14sm912099bwz.10.2010.03.25.09.17.51 (version=SSLv3 cipher=RC4-MD5); Thu, 25 Mar 2010 09:17:52 -0700 (PDT) Subject: [PATCH] xt_hashlimit: IPV6 bugfix From: Eric Dumazet To: Patrick McHardy Cc: netdev , Netfilter Development Mailinglist , David Miller Date: Thu, 25 Mar 2010 17:17:49 +0100 Message-ID: <1269533869.3626.41.camel@edumazet-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A missing break statement in hashlimit_ipv6_mask(), and masks between /64 and /95 are not working at all... Signed-off-by: Eric Dumazet --- -- 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/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index 8f3e0c0..7ac6ea7 100644 --- a/net/netfilter/xt_hashlimit.c +++ b/net/netfilter/xt_hashlimit.c @@ -487,6 +487,7 @@ static void hashlimit_ipv6_mask(__be32 *i, unsigned int p) case 64 ... 95: i[2] = maskl(i[2], p - 64); i[3] = 0; + break; case 96 ... 127: i[3] = maskl(i[3], p - 96); break;