Re: [NETFILTER 09/09]: futher {ip,ip6,arp}_tables unification

[Patrick McHardy <kaber@trash.net>]

[-- Attachment #1: Type: text/plain, Size: 618 bytes --]

Dmitry Mishin wrote:
> On Tuesday 21 March 2006 11:59, Patrick McHardy wrote:
> 
>>Sorry, I haven't figured out the problem yet, but it seems your
>>patch wasn't responsible. Anyway, I'll fix it once I figure it
>>out, so don't worry.
> 
> Could it be due to alignment checks in user or kernel space? I don't check it, 
> but think that current ip6_tables compatibility layer isn't sufficient, as it 
> is for ip_tables compatibility.

No, the problem is that nf_getsockopt is not called anymore because
do_ipv6_getsockopt doesn't return -ENOPROTOOPT but -EINVAL for
unknown options. I've queued this patch to fix it.

[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 905 bytes --]

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 602feec..4c20eeb 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -907,7 +907,7 @@ int ipv6_getsockopt(struct sock *sk, int
 	err = do_ipv6_getsockopt(sk, level, optname, optval, optlen);
 #ifdef CONFIG_NETFILTER
 	/* we need to exclude all possible EINVALs except default case */
-	if (err == -ENOPROTOOPT && optname != IPV6_ADDRFORM &&
+	if (err == -EINVAL && optname != IPV6_ADDRFORM &&
 			optname != MCAST_MSFILTER) {
 		int len;
 
@@ -944,7 +944,7 @@ int compat_ipv6_getsockopt(struct sock *
 	err = do_ipv6_getsockopt(sk, level, optname, optval, optlen);
 #ifdef CONFIG_NETFILTER
 	/* we need to exclude all possible EINVALs except default case */
-	if (err == -ENOPROTOOPT && optname != IPV6_ADDRFORM &&
+	if (err == -EINVAL && optname != IPV6_ADDRFORM &&
 			optname != MCAST_MSFILTER) {
 		int len;