Patchwork [net-next,07/17] user_ns: get rid of duplicate code in net_ctl_permissions

login
register
mail settings
Submitter Eric W. Biederman
Date Nov. 16, 2012, 1:03 p.m.
Message ID <1353070992-5552-7-git-send-email-ebiederm@xmission.com>
Download mbox | patch
Permalink /patch/199576/
State Accepted
Delegated to: David Miller
Headers show

Comments

Eric W. Biederman - Nov. 16, 2012, 1:03 p.m.
From: Zhao Hongjiang <zhaohongjiang@huawei.com>

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>
---
 net/sysctl_net.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index 6410436..9bc6db0 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;
 }