From patchwork Mon Jan 19 14:19:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McHardy X-Patchwork-Id: 19320 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 67A99DE007 for ; Tue, 20 Jan 2009 01:19:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757427AbZASOTr (ORCPT ); Mon, 19 Jan 2009 09:19:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757368AbZASOTl (ORCPT ); Mon, 19 Jan 2009 09:19:41 -0500 Received: from stinky.trash.net ([213.144.137.162]:40048 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755672AbZASOTi (ORCPT ); Mon, 19 Jan 2009 09:19:38 -0500 Received: from x2.localnet (localhost [127.0.0.1]) by stinky.trash.net (Postfix) with ESMTP id 6BAF0948C3; Mon, 19 Jan 2009 15:19:36 +0100 (MET) From: Patrick McHardy To: stable@kernel.org Cc: netdev@vger.kernel.org, Patrick McHardy , netfilter-devel@vger.kernel.org, davem@davemloft.net Message-Id: <20090119141936.3312.11001.sendpatchset@x2.localnet> In-Reply-To: <20090119141934.3312.15532.sendpatchset@x2.localnet> References: <20090119141934.3312.15532.sendpatchset@x2.localnet> Subject: netfilter 01/03: x_tables: fix match/target revision lookup Date: Mon, 19 Jan 2009 15:19:36 +0100 (MET) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit 2a95ec76ab10585ce54a64300b9bf9b76f10269d Author: Patrick McHardy Date: Mon Jan 19 15:10:50 2009 +0100 netfilter: x_tables: fix match/target revision lookup Upstream commit 656caff: Commit 55b69e91 (netfilter: implement NFPROTO_UNSPEC as a wildcard for extensions) broke revision probing for matches and targets that are registered with NFPROTO_UNSPEC. Fix by continuing the search on the NFPROTO_UNSPEC list if nothing is found on the af-specific lists. Signed-off-by: Patrick McHardy --- 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/x_tables.c b/net/netfilter/x_tables.c index 89837a4..bfbf521 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -273,6 +273,10 @@ static int match_revfn(u8 af, const char *name, u8 revision, int *bestp) have_rev = 1; } } + + if (af != NFPROTO_UNSPEC && !have_rev) + return match_revfn(NFPROTO_UNSPEC, name, revision, bestp); + return have_rev; } @@ -289,6 +293,10 @@ static int target_revfn(u8 af, const char *name, u8 revision, int *bestp) have_rev = 1; } } + + if (af != NFPROTO_UNSPEC && !have_rev) + return target_revfn(NFPROTO_UNSPEC, name, revision, bestp); + return have_rev; }