Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fs/proc/namespaces.c: prevent crash when ns_entries[] is empty

Browse source 
If CONFIG_NET_NS, CONFIG_UTS_NS and CONFIG_IPC_NS are disabled,
ns_entries[] becomes empty and things like
ns_entries[ARRAY_SIZE(ns_entries) - 1] will explode.

Reported-by: Richard Weinberger <richard@nod.at>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Daniel Lezcano <daniel.lezcano@free.fr>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2012-03-28 14:42:52 -07:00 committed by Linus Torvalds
parent f4507164e7
commit 4c619aa0ba
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/proc/namespaces.c
View file

@ -156,15 +156,15 @@ static struct dentry *proc_ns_dir_lookup(struct inode *dir,
if (!ptrace_may_access(task, PTRACE_MODE_READ)) if (!ptrace_may_access(task, PTRACE_MODE_READ))
goto out; goto out;
last = &ns_entries[ARRAY_SIZE(ns_entries) - 1]; last = &ns_entries[ARRAY_SIZE(ns_entries)];
for (entry = ns_entries; entry <= last; entry++) { for (entry = ns_entries; entry < last; entry++) {
if (strlen((*entry)->name) != len) if (strlen((*entry)->name) != len)
continue; continue;
if (!memcmp(dentry->d_name.name, (*entry)->name, len)) if (!memcmp(dentry->d_name.name, (*entry)->name, len))
break; break;
} }
error = ERR_PTR(-ENOENT); error = ERR_PTR(-ENOENT);
if (entry > last) if (entry == last)
goto out; goto out;
error = proc_ns_instantiate(dir, dentry, task, *entry); error = proc_ns_instantiate(dir, dentry, task, *entry);