summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-09-06 12:01:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-14 10:00:22 -0700
commit05d71a5a25da396f76ee942af6682dfaecc73e84 (patch)
treede2b299e87d121de753838be8285f9d1dc7f25e5
parent242fa18ad8d4665c151bdd5c34ac34a8e701fff7 (diff)
downloadlinux-3.10-05d71a5a25da396f76ee942af6682dfaecc73e84.tar.gz
linux-3.10-05d71a5a25da396f76ee942af6682dfaecc73e84.tar.bz2
linux-3.10-05d71a5a25da396f76ee942af6682dfaecc73e84.zip
Remove user-triggerable BUG from mpol_to_str
commit 80de7c3138ee9fd86a98696fd2cf7ad89b995d0a upstream. Trivially triggerable, found by trinity: kernel BUG at mm/mempolicy.c:2546! Process trinity-child2 (pid: 23988, threadinfo ffff88010197e000, task ffff88007821a670) Call Trace: show_numa_map+0xd5/0x450 show_pid_numa_map+0x13/0x20 traverse+0xf2/0x230 seq_read+0x34b/0x3e0 vfs_read+0xac/0x180 sys_pread64+0xa2/0xc0 system_call_fastpath+0x1a/0x1f RIP: mpol_to_str+0x156/0x360 Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--mm/mempolicy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index bf5b485ecd3..9afcbad632e 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2536,7 +2536,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
break;
default:
- BUG();
+ return -EINVAL;
}
l = strlen(policy_modes[mode]);