diff options
| author | dim <dim@FreeBSD.org> | 2015-06-20 19:34:50 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-06-20 19:34:50 +0000 |
| commit | e109f99dcb6c95c84bbec22229de29a25491f7c2 (patch) | |
| tree | d142d742b698973a366ae768a3f4033924e314c8 /sys/kern/imgact_aout.c | |
| parent | 238df27d058d0d8912acf0a186d3f43289a0a2b6 (diff) | |
| parent | cb167b45a82327b0d6d88e85e3d6e2e326291ee4 (diff) | |
| download | FreeBSD-src-e109f99dcb6c95c84bbec22229de29a25491f7c2.zip FreeBSD-src-e109f99dcb6c95c84bbec22229de29a25491f7c2.tar.gz | |
Merge ^/head r284188 through r284643.
Diffstat (limited to 'sys/kern/imgact_aout.c')
| -rw-r--r-- | sys/kern/imgact_aout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index edd5f5f..3165ac0 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -248,7 +248,7 @@ exec_aout_imgact(struct image_params *imgp) a_out->a_text > maxtsiz || /* data + bss can't exceed rlimit */ - a_out->a_data + bss_size > lim_cur(imgp->proc, RLIMIT_DATA) || + a_out->a_data + bss_size > lim_cur_proc(imgp->proc, RLIMIT_DATA) || racct_set(imgp->proc, RACCT_DATA, a_out->a_data + bss_size) != 0) { PROC_UNLOCK(imgp->proc); return (ENOMEM); |
