diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:53:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:53:17 +0100 |
| commit | 2622e849a1d3d3ef531d1cc33308bb7fd00eee40 (patch) | |
| tree | f2be9d9f08444cb93b3a8f87099fe4ff8ac3cd57 /kernel/sys.c | |
| parent | 996636ddae5cab8883bd76b996cd4f2ea9a152be (diff) | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
| download | linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.tar.bz2 | |
Merge tag 'v3.19-rc7' into locking/core, to refresh the branch before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index a8c9f5a7dda6..ea9c88109894 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2210,9 +2210,13 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, up_write(&me->mm->mmap_sem); break; case PR_MPX_ENABLE_MANAGEMENT: + if (arg2 || arg3 || arg4 || arg5) + return -EINVAL; error = MPX_ENABLE_MANAGEMENT(me); break; case PR_MPX_DISABLE_MANAGEMENT: + if (arg2 || arg3 || arg4 || arg5) + return -EINVAL; error = MPX_DISABLE_MANAGEMENT(me); break; default: |