d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Brought fix from the 2.2 branch forward (see rev 1.47.2.7): serious bugs

Browse Source 
with reading the image header.
This commit is contained in:
David Greenman 1997-04-18 02:43:05 +00:00
parent a6f96c4131
commit 1ebd0c5945
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/kern/kern_exec.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: kern_exec.c,v 1.61 1997/04/13 03:05:31 dyson Exp $
*/
#include <sys/param.h>
@ -57,6 +57,7 @@
#include <vm/vm_map.h>
#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
#include <vm/vm_object.h>
#include <sys/user.h>
@ -166,7 +167,10 @@ execve(p, uap, retval)
* Get the image header, which we define here as meaning the first
* page of the executable.
*/
if (imgp->vp->v_mount && imgp->vp->v_mount->mnt_stat.f_iosize >= PAGE_SIZE) {
if (imgp->vp->v_object && imgp->vp->v_mount &&
imgp->vp->v_mount->mnt_stat.f_iosize >= PAGE_SIZE &&
imgp->vp->v_object->un_pager.vnp.vnp_size >=
imgp->vp->v_mount->mnt_stat.f_iosize) {
/*
* Get a buffer with (at least) the first page.
*/
@ -174,6 +178,8 @@ execve(p, uap, retval)
p->p_ucred, &bp);
imgp->image_header = bp->b_data;
} else {
int resid;
/*
* The filesystem block size is too small, so do this the hard
* way. Malloc some space and read PAGE_SIZE worth of the image
@ -181,7 +187,12 @@ execve(p, uap, retval)
*/
imgp->image_header = malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
error = vn_rdwr(UIO_READ, imgp->vp, (void *)imgp->image_header, PAGE_SIZE, 0,
UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred, NULL, p);
UIO_SYSSPACE, IO_NODELOCKED, p->p_ucred, &resid, p);
/*
* Clear out any remaining junk.
*/
if (!error && resid)
bzero((char *)imgp->image_header + PAGE_SIZE - resid, resid);
}
VOP_UNLOCK(imgp->vp, 0, p);
if (error)