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>

diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 9548a09..3f93bb9 100644 (file)
--- 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;