projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gpio-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
exec.c
diff --git
a/fs/exec.c
b/fs/exec.c
index 9e81c630dfa76469cdd452e179882403a93b03c8..238b7aa26f68ab538df0cc219073a3d26541cc11 100644
(file)
--- a/
fs/exec.c
+++ b/
fs/exec.c
@@
-657,10
+657,10
@@
int setup_arg_pages(struct linux_binprm *bprm,
unsigned long rlim_stack;
#ifdef CONFIG_STACK_GROWSUP
unsigned long rlim_stack;
#ifdef CONFIG_STACK_GROWSUP
- /* Limit stack size
to 1GB
*/
+ /* Limit stack size */
stack_base = rlimit_max(RLIMIT_STACK);
stack_base = rlimit_max(RLIMIT_STACK);
- if (stack_base >
(1 << 30)
)
- stack_base =
1 << 30
;
+ if (stack_base >
STACK_SIZE_MAX
)
+ stack_base =
STACK_SIZE_MAX
;
/* Make sure we didn't let the argument array grow too large. */
if (vma->vm_end - vma->vm_start > stack_base)
/* Make sure we didn't let the argument array grow too large. */
if (vma->vm_end - vma->vm_start > stack_base)
@@
-813,7
+813,7
@@
EXPORT_SYMBOL(kernel_read);
ssize_t read_code(struct file *file, unsigned long addr, loff_t pos, size_t len)
{
ssize_t read_code(struct file *file, unsigned long addr, loff_t pos, size_t len)
{
- ssize_t res =
file->f_op->
read(file, (void __user *)addr, len, &pos);
+ ssize_t res =
vfs_
read(file, (void __user *)addr, len, &pos);
if (res > 0)
flush_icache_range(addr, addr + len);
return res;
if (res > 0)
flush_icache_range(addr, addr + len);
return res;