Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1d2c8b6 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

fdpic: check that the size returned by kernel_read() is what we asked for 



Check that the size of the read returned by kernel_read() is what we asked
for.  If it isn't, then reject the binary as being a badly formatted.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 76308da1

fs/binfmt_elf_fdpic.c

+10 −4
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ static int elf_fdpic_fetch_phdrs(struct elf_fdpic_params *params, 


	retval = kernel_read(file, params->hdr.e_phoff,

			     (char *) params->phdrs, size);

	if (retval < 0)

		return retval;

	if (unlikely(retval != size))

		return retval < 0 ? retval : -ENOEXEC;



	/* determine stack size for this binary */

	phdr = params->phdrs;
@@ -218,8 +218,11 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, 
					     phdr->p_offset,

					     interpreter_name,

					     phdr->p_filesz);

			if (retval < 0)

			if (unlikely(retval != phdr->p_filesz)) {

				if (retval >= 0)

					retval = -ENOEXEC;

				goto error;

			}



			retval = -ENOENT;

			if (interpreter_name[phdr->p_filesz - 1] != '\0')
@@ -245,8 +248,11 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm, 


			retval = kernel_read(interpreter, 0, bprm->buf,

					     BINPRM_BUF_SIZE);

			if (retval < 0)

			if (unlikely(retval != BINPRM_BUF_SIZE)) {

				if (retval >= 0)

					retval = -ENOEXEC;

				goto error;

			}



			interp_params.hdr = *((struct elfhdr *) bprm->buf);

			break;