Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310549
b: refs/heads/master
c: 1ad75b9
h: refs/heads/master
i:
  310547: 1a69a8a
v: v3
  • Loading branch information
Cyrill Gorcunov authored and Linus Torvalds committed Jun 7, 2012
1 parent 99b7f61 commit 45ae0f5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bafb282df29c1524b1617019adebd6d0c3eb7a47
refs/heads/master: 1ad75b9e16280ca4e2501a629a225319cf2eef2e
2 changes: 1 addition & 1 deletion trunk/kernel/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -1869,7 +1869,7 @@ static int prctl_set_mm(int opt, unsigned long addr,
if (opt == PR_SET_MM_EXE_FILE)
return prctl_set_mm_exe_file(mm, (unsigned int)addr);

if (addr >= TASK_SIZE)
if (addr >= TASK_SIZE || addr < mmap_min_addr)
return -EINVAL;

error = -EINVAL;
Expand Down

0 comments on commit 45ae0f5

Please sign in to comment.