diff options
author | Zhao Hongjiang <zhaohongjiang@huawei.com> | 2012-11-15 22:03:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-18 20:32:45 -0500 |
commit | 86937c05cb44654649a089744cd49ab0dc6873a8 (patch) | |
tree | a283a8ee7d4cb38dcbaf6b239d422b079c47130b /net/sysctl_net.c | |
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/sysctl_net.c')
-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 6410436aa492..9bc6db04be3e 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, | |||
51 | int mode = (table->mode >> 6) & 7; | 51 | int mode = (table->mode >> 6) & 7; |
52 | return (mode << 6) | (mode << 3) | mode; | 52 | return (mode << 6) | (mode << 3) | mode; |
53 | } | 53 | } |
54 | /* Allow netns root group to have the same assess as the root group */ | 54 | /* Allow netns root group to have the same access as the root group */ |
55 | if (gid_eq(root_gid, current_gid())) { | 55 | if (gid_eq(root_gid, current_gid())) { |
56 | int mode = (table->mode >> 3) & 7; | 56 | int mode = (table->mode >> 3) & 7; |
57 | return (mode << 3) | (mode << 3) | mode; | 57 | return (mode << 3) | mode; |
58 | } | 58 | } |
59 | return table->mode; | 59 | return table->mode; |
60 | } | 60 | } |