summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>2009-11-09 09:12:15 +0900
committerEric W. Biederman <ebiederm@xmission.com>2009-11-12 02:05:05 -0800
commit86b1bc68e2f4244e4ea5db5458df9d19259fbb30 (patch)
treea667f1fced80af12e75e28a8fd04f48ad3942ba7
parent50469619999a0bc2ba8fa1365dc443b7aed190af (diff)
downloadop-kernel-dev-86b1bc68e2f4244e4ea5db5458df9d19259fbb30.zip
op-kernel-dev-86b1bc68e2f4244e4ea5db5458df9d19259fbb30.tar.gz
sysctl security/tomoyo: Don't look at ctl_name
ctl_name field was removed. Always use procname field. Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
-rw-r--r--security/tomoyo/tomoyo.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 9548a09..3f93bb9 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -122,15 +122,7 @@ static char *tomoyo_sysctl_path(struct ctl_table *table)
*--end = '\0';
buflen--;
while (table) {
- char num[32];
- const char *sp = table->procname;
-
- if (!sp) {
- memset(num, 0, sizeof(num));
- snprintf(num, sizeof(num) - 1, "=%d=", table->ctl_name);
- sp = num;
- }
- if (tomoyo_prepend(&end, &buflen, sp) ||
+ if (tomoyo_prepend(&end, &buflen, table->procname) ||
tomoyo_prepend(&end, &buflen, "/"))
goto out;
table = table->parent;
OpenPOWER on IntegriCloud