diff options
author | bde <bde@FreeBSD.org> | 1997-07-20 14:21:36 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-07-20 14:21:36 +0000 |
commit | bad31a2faa9d8419cb5d26249dd0325784ab1f78 (patch) | |
tree | d0493edae993481346b22e494dfd6296a9ebc31d /sys/i386/linux/imgact_linux.c | |
parent | 26179d3e8df27db3d7eb25e684b654cee8f02116 (diff) | |
download | FreeBSD-src-bad31a2faa9d8419cb5d26249dd0325784ab1f78.zip FreeBSD-src-bad31a2faa9d8419cb5d26249dd0325784ab1f78.tar.gz |
Fixed data+bss limit (use the current rlimit instead of MAXDSIZ).
Diffstat (limited to 'sys/i386/linux/imgact_linux.c')
-rw-r--r-- | sys/i386/linux/imgact_linux.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 4aae9f5..6118d09 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -28,13 +28,9 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_linux.c,v 1.21 1997/04/01 08:39:05 bde Exp $ + * $Id: imgact_linux.c,v 1.22 1997/04/13 01:48:17 dyson Exp $ */ -#ifndef LKM -#include "opt_rlimit.h" -#endif - #include <sys/param.h> #include <sys/systm.h> #include <sys/resourcevar.h> @@ -109,8 +105,8 @@ exec_linux_imgact(imgp) /* * text/data/bss must not exceed limits */ - if (a_out->a_text > MAXTSIZ || a_out->a_data + bss_size > MAXDSIZ || - a_out->a_data+bss_size > imgp->proc->p_rlimit[RLIMIT_DATA].rlim_cur) + if (a_out->a_text > MAXTSIZ || + a_out->a_data + bss_size > imgp->proc->p_rlimit[RLIMIT_DATA].rlim_cur) return (ENOMEM); /* copy in arguments and/or environment from old process */ |