user_ns: get rid of duplicate code in net_ctl_permissions

Get rid of duplicate code in net_ctl_permissions and fix the comment.

Signed-off-by: Zhao Hongjiang <[email protected]>
Signed-off-by: Eric W. Biederman <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 6410436aa492caa0800f9b04d74000f62f3901e2..9bc6db04be3ea7cd998f41187ff40b19baa9c920 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -51,10 +51,10 @@ static int net_ctl_permissions(struct ctl_table_header *head,
                int mode = (table->mode >> 6) & 7;
                return (mode << 6) | (mode << 3) | mode;
        }
-       /* Allow netns root group to have the same assess as the root group */
+       /* 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 << 3) | mode;
+               return (mode << 3) | mode;
        }
        return table->mode;
 }