View | Details | Raw Unified
Collapse All | Expand All

(-) a/fs/binfmt_elf.c (-7 / +24 lines)
 Lines 335-343    Link Here 
		goto out;
		goto out;
	retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size);
	retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size);
	error = retval;
	error = -EIO;
	if (retval < 0)
	if (retval != size) {
		if (retval < 0)
			error = retval;	
		goto out_close;
		goto out_close;
	}
	eppnt = elf_phdata;
	eppnt = elf_phdata;
	for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) {
	for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) {
 Lines 532-539    Link Here 
		goto out;
		goto out;
	retval = kernel_read(bprm->file, loc->elf_ex.e_phoff, (char *) elf_phdata, size);
	retval = kernel_read(bprm->file, loc->elf_ex.e_phoff, (char *) elf_phdata, size);
	if (retval < 0)
	if (retval != size) {
		if (retval >= 0)
			retval = -EIO;
		goto out_free_ph;
		goto out_free_ph;
	}
	files = current->files;		/* Refcounted so ok */
	files = current->files;		/* Refcounted so ok */
	retval = unshare_files();
	retval = unshare_files();
 Lines 580-587    Link Here 
			retval = kernel_read(bprm->file, elf_ppnt->p_offset,
			retval = kernel_read(bprm->file, elf_ppnt->p_offset,
					   elf_interpreter,
					   elf_interpreter,
					   elf_ppnt->p_filesz);
					   elf_ppnt->p_filesz);
			if (retval < 0)
			if (retval != elf_ppnt->p_filesz) {
				if (retval >= 0)
					retval = -EIO;
				goto out_free_interp;
				goto out_free_interp;
			}
			/* make sure path is NULL terminated */
			elf_interpreter[elf_ppnt->p_filesz - 1] = '\0';
			/* If the program interpreter is one of these two,
			/* If the program interpreter is one of these two,
			 * then assume an iBCS2 image. Otherwise assume
			 * then assume an iBCS2 image. Otherwise assume
			 * a native linux image.
			 * a native linux image.
 Lines 616-623    Link Here 
			if (IS_ERR(interpreter))
			if (IS_ERR(interpreter))
				goto out_free_interp;
				goto out_free_interp;
			retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
			retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
			if (retval < 0)
			if (retval != BINPRM_BUF_SIZE) {
				if (retval >= 0)
					retval = -EIO;
				goto out_free_dentry;
				goto out_free_dentry;
			}
			/* Get the exec headers */
			/* Get the exec headers */
			loc->interp_ex = *((struct exec *) bprm->buf);
			loc->interp_ex = *((struct exec *) bprm->buf);
 Lines 776-783    Link Here 
		}
		}
		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);
		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);
		if (BAD_ADDR(error))
		if (BAD_ADDR(error)) {
			continue;
			send_sig(SIGKILL, current, 0);
			goto out_free_dentry;
		}
		if (!load_addr_set) {
		if (!load_addr_set) {
			load_addr_set = 1;
			load_addr_set = 1;