[kernel] r20147 - in dists/sid/linux/debian: . config

[Ben Hutchings]

Author: benh
Date: Thu May 30 04:27:22 2013
New Revision: 20147

Log:
Explicitly disable USER_NS for now

Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/config/config

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Thu May 30 04:23:59 2013	(r20146)
+++ dists/sid/linux/debian/changelog	Thu May 30 04:27:22 2013	(r20147)
@@ -7,6 +7,8 @@
     - [armel] media: VIDEO_ZORAN is disabled as it requires virt_to_bus()
     - [armhf/omap] OMAP_MBOX_FWK and TIDSPBRIDGE is disabled as they are
       not yet compatible with ARM multiplatform
+    - USER_NS is disabled, at least until all filesystems are compatible
+      with it
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.9.1
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.9.2

Modified: dists/sid/linux/debian/config/config
==============================================================================
--- dists/sid/linux/debian/config/config	Thu May 30 04:23:59 2013	(r20146)
+++ dists/sid/linux/debian/config/config	Thu May 30 04:27:22 2013	(r20147)
@@ -4002,7 +4002,8 @@
 # CONFIG_DEBUG_BLK_CGROUP is not set
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
+#. Do not enable this without discussion of the security implications
+# CONFIG_USER_NS is not set
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y