diff options
| author | trasz <trasz@FreeBSD.org> | 2011-04-05 20:23:59 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2011-04-05 20:23:59 +0000 |
| commit | 92bec9b84c91c81031aecc423fd62e9a9b27b631 (patch) | |
| tree | ff083b539865dc2215b27827e89a3109487e5979 /sys/i386/linux/imgact_linux.c | |
| parent | fffd1b22a504ec96e5bf538ba769d4ea4f5c8ded (diff) | |
| download | FreeBSD-src-92bec9b84c91c81031aecc423fd62e9a9b27b631.zip FreeBSD-src-92bec9b84c91c81031aecc423fd62e9a9b27b631.tar.gz | |
Add accounting for most of the memory-related resources.
Sponsored by: The FreeBSD Foundation
Reviewed by: kib (earlier version)
Diffstat (limited to 'sys/i386/linux/imgact_linux.c')
| -rw-r--r-- | sys/i386/linux/imgact_linux.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index c4e4b66..3a66e87 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include <sys/mman.h> #include <sys/mutex.h> #include <sys/proc.h> +#include <sys/racct.h> #include <sys/resourcevar.h> #include <sys/vnode.h> @@ -107,7 +108,8 @@ exec_linux_imgact(struct image_params *imgp) */ PROC_LOCK(imgp->proc); if (a_out->a_text > maxtsiz || - a_out->a_data + bss_size > lim_cur(imgp->proc, RLIMIT_DATA)) { + a_out->a_data + bss_size > lim_cur(imgp->proc, RLIMIT_DATA) || + racct_set(imgp->proc, RACCT_DATA, a_out->a_data + bss_size) != 0) { PROC_UNLOCK(imgp->proc); return (ENOMEM); } |
