cd908a62af819e64272a7f93f6fc5dc4e0901bb523f11f3c61664830.patch

From 2aa9c668d4076c6cd23e888ea1c55602da386d84 Mon Sep 17 00:00:00 2001
From: Kevin Cernekee <cernekee@chromium.org>
Date: Thu, 30 Jun 2016 20:49:37 -0700
Subject: [PATCH] CHROMIUM: Export /proc/sys/net/core/android_paranoid in user
 namespaces

This knob requires special treatment because we depend on it being
available inside the container.  When user namespaces were enabled,
the other knob (somaxconn) vanished.

BUG=b:27932716
TEST=`android-sh -c "ls /proc/sys/net/core"`

Signed-off-by: Kevin Cernekee <cernekee@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/362672
Reviewed-by: Guenter Roeck <groeck@google.com>

(cherry picked from commit 42721a768f86a1cf7d318b59fa03ba69fa10fb3b)

Change-Id: I22c29fc29ad774c2a70ce9f9148141974dab39e7
Signed-off-by: Taoyu Li <taoyl@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2213510
Tested-by: Taoyu Li <taoyl@chromium.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Commit-Queue: Taoyu Li <taoyl@chromium.org>
Auto-Submit: Taoyu Li <taoyl@chromium.org>
---
 net/core/sysctl_net_core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index d2d44f70ec83d24ae579a9fa565d5bc6c9ff6dc1..35eda07159ea67c8b7b25bf19d15fa16330c29df 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -666,20 +666,20 @@ static struct ctl_table netns_core_table[] = {
 	},
 #endif
 	{
-		.procname	= "somaxconn",
-		.data		= &init_net.core.sysctl_somaxconn,
+		.procname	= "android_paranoid",
+		.data		= &init_net.core.sysctl_android_paranoid,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
 		.extra1		= SYSCTL_ZERO,
+		.extra2		= SYSCTL_ONE,
 		.proc_handler	= proc_dointvec_minmax
 	},
 	{
-		.procname	= "android_paranoid",
-		.data		= &init_net.core.sysctl_android_paranoid,
+		.procname	= "somaxconn",
+		.data		= &init_net.core.sysctl_somaxconn,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
 		.extra1		= SYSCTL_ZERO,
-		.extra2		= SYSCTL_ONE,
 		.proc_handler	= proc_dointvec_minmax
 	},
 	{
-- 
2.34.1