diff options
| author | Zhao Hongjiang <zhaohongjiang@huawei.com> | 2012-11-16 03:03:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-18 20:32:45 -0500 |
| commit | 86937c05cb44654649a089744cd49ab0dc6873a8 (patch) | |
| tree | a283a8ee7d4cb38dcbaf6b239d422b079c47130b /net | |
| parent | cff109768b2d9c03095848f4cd4b0754117262aa (diff) | |
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 <zhaohongjiang@huawei.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sysctl_net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 6410436aa49..9bc6db04be3 100644 --- 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; } |