diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-20 14:59:50 -0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-03-20 14:59:50 -0400 |
| commit | 44e8ba93cf330f075178e31759100f367313790a (patch) | |
| tree | 27956beb159bfb603d672b43cb207690a087dd0a /kernel/sys.c | |
| parent | e9fe8a714e450b26f76eaf8832f5b9fe24d00e79 (diff) | |
| parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) | |
Merge commit 'v3.3' into fbdev-next
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 40701538fbd1..888d227fd195 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
| @@ -1706,7 +1706,7 @@ static int prctl_set_mm(int opt, unsigned long addr, | |||
| 1706 | if (arg4 | arg5) | 1706 | if (arg4 | arg5) |
| 1707 | return -EINVAL; | 1707 | return -EINVAL; |
| 1708 | 1708 | ||
| 1709 | if (!capable(CAP_SYS_ADMIN)) | 1709 | if (!capable(CAP_SYS_RESOURCE)) |
| 1710 | return -EPERM; | 1710 | return -EPERM; |
| 1711 | 1711 | ||
| 1712 | if (addr >= TASK_SIZE) | 1712 | if (addr >= TASK_SIZE) |