Fixed data+bss limit (use the current rlimit instead of MAXDSIZ).

This commit is contained in:
Bruce Evans 1997-07-20 14:21:36 +00:00
parent f71d35e402
commit 5f2d49adc9
1 changed files with 3 additions and 7 deletions

View File

@ -28,13 +28,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 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/param.h>
#include <sys/systm.h> #include <sys/systm.h>
#include <sys/resourcevar.h> #include <sys/resourcevar.h>
@ -109,8 +105,8 @@ exec_linux_imgact(imgp)
/* /*
* text/data/bss must not exceed limits * text/data/bss must not exceed limits
*/ */
if (a_out->a_text > MAXTSIZ || a_out->a_data + bss_size > MAXDSIZ || if (a_out->a_text > MAXTSIZ ||
a_out->a_data+bss_size > imgp->proc->p_rlimit[RLIMIT_DATA].rlim_cur) a_out->a_data + bss_size > imgp->proc->p_rlimit[RLIMIT_DATA].rlim_cur)
return (ENOMEM); return (ENOMEM);
/* copy in arguments and/or environment from old process */ /* copy in arguments and/or environment from old process */