Merge tag 'v3.8-rc3' into v4l_for_linus

Linux 3.8-rc3

* tag 'v3.8-rc3': (11110 commits)
  Linux 3.8-rc3
  mm: reinstante dropped pmd_trans_splitting() check
  cred: Remove tgcred pointer from struct cred
  drm/ttm: fix fence locking in ttm_buffer_object_transfer
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  drm/prime: drop reference on imported dma-buf come from gem
  xen/netfront: improve truesize tracking
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  sctp: fix Kconfig bug in default cookie hmac selection
  EDAC: Cleanup device deregistering path
  EDAC: Fix EDAC Kconfig menu
  EDAC: Fix kernel panic on module unloading
  ALSA: hda - add mute LED for HP Pavilion 17 (Realtek codec)
  ...

1 files changed, 12 insertions, 3 deletions

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index e3a6e37cd1c5..9bc6db04be3e 100644
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -38,15 +38,24 @@ static int is_seen(struct ctl_table_set *set)
 }
 
 /* Return standard mode bits for table entry. */
-static int net_ctl_permissions(struct ctl_table_root *root,
-                               struct nsproxy *nsproxy,
+static int net_ctl_permissions(struct ctl_table_header *head,
                                struct ctl_table *table)
 {
+        struct net *net = container_of(head->set, struct net, sysctls);
+        kuid_t root_uid = make_kuid(net->user_ns, 0);
+        kgid_t root_gid = make_kgid(net->user_ns, 0);
+
         /* Allow network administrator to have same access as root. */
-        if (capable(CAP_NET_ADMIN)) {
+        if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
+            uid_eq(root_uid, current_uid())) {
                 int mode = (table->mode >> 6) & 7;
                 return (mode << 6) | (mode << 3) | mode;
         }
+        /* Allow netns root group to have the same access as the root group */
+        if (gid_eq(root_gid, current_gid())) {
+                int mode = (table->mode >> 3) & 7;
+                return (mode << 3) | mode;
+        }
         return table->mode;
 }