Patchwork net: Default UDP and UNIX diag to 'n'.

login
register
mail settings
Submitter Pavel Emelyanov
Date Feb. 7, 2012, 1:37 p.m.
Message ID <4F31292F.2090503@parallels.com>
Download mbox | patch
Permalink /patch/139929/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Pavel Emelyanov - Feb. 7, 2012, 1:37 p.m.
>> diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
>> index 1a8f93b..43e1439 100644
>> --- a/net/ipv4/Kconfig
>> +++ b/net/ipv4/Kconfig
>> @@ -410,8 +410,12 @@ config INET_TCP_DIAG
>>  	def_tristate INET_DIAG
>>  
>>  config INET_UDP_DIAG
>> +	tristate "UDP: socket monitoring interface"
>>  	depends on INET_DIAG
>> -	def_tristate INET_DIAG && IPV6
> This broke earlier patch 
> b872a2371ffd13e6d83423ef621a707df4c158ac "udp_diag: Make it module when ipv6 is a module",
> which brings back the compilation error when compiling linus master (v3.3-rc2+):
> 
> net/built-in.o: In function `udp_dump_one':
> udp_diag.c:(.text+0x59852): undefined reference to `__udp6_lib_lookup'
> 
> 
>> +	default n
>> +	---help---
>> +	  Support for UDP socket monitoring interface used by the ss tool.
>> +	  If unsure, say Y.
>>  

I assume you have CONFIG_IPV6=m and CONFIG_INET_UDP_DIAG=y, right?
This one should fix the issue, you'll not be able to set it to Y when
IPV6 is M.


[PATCH] udp_diag: Add dependency on IPV6

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

--
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
Anisse Astier - Feb. 7, 2012, 1:51 p.m.
On Tue, 07 Feb 2012 17:37:51 +0400, Pavel Emelyanov <xemul@parallels.com> wrote :

> >> diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
> >> index 1a8f93b..43e1439 100644
> >> --- a/net/ipv4/Kconfig
> >> +++ b/net/ipv4/Kconfig
> >> @@ -410,8 +410,12 @@ config INET_TCP_DIAG
> >>  	def_tristate INET_DIAG
> >>  
> >>  config INET_UDP_DIAG
> >> +	tristate "UDP: socket monitoring interface"
> >>  	depends on INET_DIAG
> >> -	def_tristate INET_DIAG && IPV6
> > This broke earlier patch 
> > b872a2371ffd13e6d83423ef621a707df4c158ac "udp_diag: Make it module when ipv6 is a module",
> > which brings back the compilation error when compiling linus master (v3.3-rc2+):
> > 
> > net/built-in.o: In function `udp_dump_one':
> > udp_diag.c:(.text+0x59852): undefined reference to `__udp6_lib_lookup'
> > 
> > 
> >> +	default n
> >> +	---help---
> >> +	  Support for UDP socket monitoring interface used by the ss tool.
> >> +	  If unsure, say Y.
> >>  
> 
> I assume you have CONFIG_IPV6=m and CONFIG_INET_UDP_DIAG=y, right?

That's correct.

> This one should fix the issue, you'll not be able to set it to Y when
> IPV6 is M.

Indeed, it fixes the issue, but it also prevents using UDP_DIAG without
IPv6 (just like the previous patch I guess.). Not a problem for me.

> 
> 
> [PATCH] udp_diag: Add dependency on IPV6
> 
> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
> 
> diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
> index aa2a2c7..55d39a4 100644
> --- a/net/ipv4/Kconfig
> +++ b/net/ipv4/Kconfig
> @@ -409,7 +409,7 @@ config INET_TCP_DIAG
>  
>  config INET_UDP_DIAG
>  	tristate "UDP: socket monitoring interface"
> -	depends on INET_DIAG
> +	depends on INET_DIAG && IPV6
>  	default n
>  	---help---
>  	  Support for UDP socket monitoring interface used by the ss tool.
--
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
David Miller - Feb. 7, 2012, 5:29 p.m.
From: Anisse Astier <anisse@astier.eu>
Date: Tue, 7 Feb 2012 14:51:20 +0100

> On Tue, 07 Feb 2012 17:37:51 +0400, Pavel Emelyanov <xemul@parallels.com> wrote :
> 
>> >> diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
>> >> index 1a8f93b..43e1439 100644
>> >> --- a/net/ipv4/Kconfig
>> >> +++ b/net/ipv4/Kconfig
>> >> @@ -410,8 +410,12 @@ config INET_TCP_DIAG
>> >>  	def_tristate INET_DIAG
>> >>  
>> >>  config INET_UDP_DIAG
>> >> +	tristate "UDP: socket monitoring interface"
>> >>  	depends on INET_DIAG
>> >> -	def_tristate INET_DIAG && IPV6
>> > This broke earlier patch 
>> > b872a2371ffd13e6d83423ef621a707df4c158ac "udp_diag: Make it module when ipv6 is a module",
>> > which brings back the compilation error when compiling linus master (v3.3-rc2+):
>> > 
>> > net/built-in.o: In function `udp_dump_one':
>> > udp_diag.c:(.text+0x59852): undefined reference to `__udp6_lib_lookup'
>> > 
>> > 
>> >> +	default n
>> >> +	---help---
>> >> +	  Support for UDP socket monitoring interface used by the ss tool.
>> >> +	  If unsure, say Y.
>> >>  
>> 
>> I assume you have CONFIG_IPV6=m and CONFIG_INET_UDP_DIAG=y, right?
> 
> That's correct.
> 
>> This one should fix the issue, you'll not be able to set it to Y when
>> IPV6 is M.
> 
> Indeed, it fixes the issue, but it also prevents using UDP_DIAG without
> IPv6 (just like the previous patch I guess.). Not a problem for me.

I don't think the previous code prevented udp_diag w/o ipv6, and requiring
ipv6 for udp_diag is not acceptable so this patch needs to be updated to
allow that.

--
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
David Miller - Feb. 7, 2012, 5:29 p.m.
From: Pavel Emelyanov <xemul@parallels.com>
Date: Tue, 07 Feb 2012 17:37:51 +0400

> @@ -409,7 +409,7 @@ config INET_TCP_DIAG
>  
>  config INET_UDP_DIAG
>  	tristate "UDP: socket monitoring interface"
> -	depends on INET_DIAG
> +	depends on INET_DIAG && IPV6

This needs to be something like "INET_DIAG && (IPV6 || IPV6=n)"
--
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

Patch

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index aa2a2c7..55d39a4 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -409,7 +409,7 @@  config INET_TCP_DIAG
 
 config INET_UDP_DIAG
 	tristate "UDP: socket monitoring interface"
-	depends on INET_DIAG
+	depends on INET_DIAG && IPV6
 	default n
 	---help---
 	  Support for UDP socket monitoring interface used by the ss tool.