diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-02-25 05:33:06 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-02-25 05:33:06 +0000 |
| commit | 770a5f7ec9cc75da9f98e1bf1bc47d9bbc4c6501 (patch) | |
| tree | b1047b8f4ff2b663fa38262860b24b000d00e18f | |
| parent | c9b9921363d92f4487d7148158a64eaa67b6b8d7 (diff) | |
| download | src-770a5f7ec9cc75da9f98e1bf1bc47d9bbc4c6501.tar.gz src-770a5f7ec9cc75da9f98e1bf1bc47d9bbc4c6501.zip | |
Removed redundant test against MAXDSIZ (the rlimit test is stronger).
Notes
Notes:
svn path=/head/; revision=33821
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 6 | ||||
| -rw-r--r-- | sys/i386/linux/linux_misc.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index a0da336a3db7..d26713016c68 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -25,7 +25,7 @@ * (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: linux_misc.c,v 1.32 1997/10/30 10:53:30 kato Exp $ + * $Id: linux_misc.c,v 1.33 1997/11/06 19:28:58 phk Exp $ */ #include <sys/param.h> @@ -289,8 +289,8 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args) * XXX: this is not complete. it should check current usage PLUS * the resources needed by this library. */ - if (a_out->a_text > MAXTSIZ || a_out->a_data + bss_size > MAXDSIZ || - a_out->a_data+bss_size > p->p_rlimit[RLIMIT_DATA].rlim_cur) { + if (a_out->a_text > MAXTSIZ || + a_out->a_data + bss_size > p->p_rlimit[RLIMIT_DATA].rlim_cur) { error = ENOMEM; goto cleanup; } diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index a0da336a3db7..d26713016c68 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -25,7 +25,7 @@ * (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: linux_misc.c,v 1.32 1997/10/30 10:53:30 kato Exp $ + * $Id: linux_misc.c,v 1.33 1997/11/06 19:28:58 phk Exp $ */ #include <sys/param.h> @@ -289,8 +289,8 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args) * XXX: this is not complete. it should check current usage PLUS * the resources needed by this library. */ - if (a_out->a_text > MAXTSIZ || a_out->a_data + bss_size > MAXDSIZ || - a_out->a_data+bss_size > p->p_rlimit[RLIMIT_DATA].rlim_cur) { + if (a_out->a_text > MAXTSIZ || + a_out->a_data + bss_size > p->p_rlimit[RLIMIT_DATA].rlim_cur) { error = ENOMEM; goto cleanup; } |