[PATCH][SRU][Disco] ipv4: enable route flushing in network namespaces

Stefan Bader stefan.bader at canonical.com
Wed Sep 25 08:47:29 UTC 2019


On 06.09.19 15:03, Christian Brauner wrote:
> BugLink: https://bugs.launchpad.net/bugs/1836912
> 
> Tools such as vpnc try to flush routes when run inside network
> namespaces by writing 1 into /proc/sys/net/ipv4/route/flush. This
> currently does not work because flush is not enabled in non-initial
> network namespaces.
> Since routes are per network namespace it is safe to enable
> /proc/sys/net/ipv4/route/flush in there.
> 
> Link: https://github.com/lxc/lxd/issues/4257
> Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
> Signed-off-by: David S. Miller <davem at davemloft.net>

From (cherry picked/backported)?
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>

> ---
>  net/ipv4/route.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/net/ipv4/route.c b/net/ipv4/route.c
> index 3c89ca325947..4b1ec9710a32 100644
> --- a/net/ipv4/route.c
> +++ b/net/ipv4/route.c
> @@ -3077,9 +3077,11 @@ static struct ctl_table ipv4_route_table[] = {
>  	{ }
>  };
>  
> +static const char ipv4_route_flush_procname[] = "flush";
> +
>  static struct ctl_table ipv4_route_flush_table[] = {
>  	{
> -		.procname	= "flush",
> +		.procname	= ipv4_route_flush_procname,
>  		.maxlen		= sizeof(int),
>  		.mode		= 0200,
>  		.proc_handler	= ipv4_sysctl_rtcache_flush,
> @@ -3097,9 +3099,11 @@ static __net_init int sysctl_route_net_init(struct net *net)
>  		if (!tbl)
>  			goto err_dup;
>  
> -		/* Don't export sysctls to unprivileged users */
> -		if (net->user_ns != &init_user_ns)
> -			tbl[0].procname = NULL;
> +		/* Don't export non-whitelisted sysctls to unprivileged users */
> +		if (net->user_ns != &init_user_ns) {
> +			if (tbl[0].procname != ipv4_route_flush_procname)
> +				tbl[0].procname = NULL;
> +		}
>  	}
>  	tbl[0].extra1 = net;
>  
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20190925/60c4725d/attachment.sig>


More information about the kernel-team mailing list