[PATCH 2.4]: ip6t_{hbh,dst}: Rejects not-strict mode on rule insersion

[PATCH 2.4]: ip6t_{hbh,dst}: Rejects not-strict mode on rule insersion

[Yasuyuki KOZAKAI]

This is for 2.4 kernel (build test with 2.4.37-rc1, I have no environment
to run 2.4, sorry).



[NETFILTER]: ip6t_{hbh,dst}: Rejects not-strict mode on rule insertion

The current code ignores rules for internal options in HBH/DST options
header in packet processing if 'Not strict' mode is specified (which is not
implemented). Clearly it is not expected by user.

Kernel should reject HBH/DST rule insertion with 'Not strict' mode
in the first place.

Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
---
 net/ipv6/netfilter/ip6t_dst.c |    6 ++++--
 net/ipv6/netfilter/ip6t_hbh.c |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/net/ipv6/netfilter/ip6t_dst.c b/net/ipv6/netfilter/ip6t_dst.c
index 65213e9..35ba724 100644
--- a/net/ipv6/netfilter/ip6t_dst.c
+++ b/net/ipv6/netfilter/ip6t_dst.c
@@ -172,8 +172,6 @@ match(const struct sk_buff *skb,
        hdrlen -= 2;
        if ( !(optinfo->flags & IP6T_OPTS_OPTS) ){
 	       return ret;
-	} else if (optinfo->flags & IP6T_OPTS_NSTRICT) {
-		DEBUGP("Not strict - not implemented");
 	} else {
 		DEBUGP("Strict ");
 		DEBUGP("#%d ",optinfo->optsnr);
@@ -253,6 +251,10 @@ checkentry(const char *tablename,
                       optsinfo->invflags);
               return 0;
        }
+	if (optsinfo->flags & IP6T_OPTS_NSTRICT) {
+		DEBUGP("ip6t_opts: Not strict - not implemented");
+		return 0;
+	}
 
        return 1;
 }
diff --git a/net/ipv6/netfilter/ip6t_hbh.c b/net/ipv6/netfilter/ip6t_hbh.c
index b37e4ce..720cb8d 100644
--- a/net/ipv6/netfilter/ip6t_hbh.c
+++ b/net/ipv6/netfilter/ip6t_hbh.c
@@ -172,8 +172,6 @@ match(const struct sk_buff *skb,
        hdrlen -= 2;
        if ( !(optinfo->flags & IP6T_OPTS_OPTS) ){
 	       return ret;
-	} else if (optinfo->flags & IP6T_OPTS_NSTRICT) {
-		DEBUGP("Not strict - not implemented");
 	} else {
 		DEBUGP("Strict ");
 		DEBUGP("#%d ",optinfo->optsnr);
@@ -253,6 +251,10 @@ checkentry(const char *tablename,
                       optsinfo->invflags);
               return 0;
        }
+	if (optsinfo->flags & IP6T_OPTS_NSTRICT) {
+		DEBUGP("ip6t_opts: Not strict - not implemented");
+		return 0;
+	}
 
        return 1;
 }
-- 
1.5.3.6

Re: [PATCH 2.4]: ip6t_{hbh,dst}: Rejects not-strict mode on rule insersion

[Patrick McHardy]

Yasuyuki KOZAKAI wrote:
> This is for 2.4 kernel (build test with 2.4.37-rc1, I have no environment
> to run 2.4, sorry).

Me neither, I'll forward it to Willy once the 2.6 version is upstream.