View | Details | Raw Unified | Return to bug 73837
Collapse All | Expand All

(-)25/fs/binfmt_elf.c~load_elf_library-kfree-fix (-13 / +17 lines)
Lines 1026-1031 out_free_ph: Link Here
1026
static int load_elf_library(struct file *file)
1026
static int load_elf_library(struct file *file)
1027
{
1027
{
1028
	struct elf_phdr *elf_phdata;
1028
	struct elf_phdr *elf_phdata;
1029
	struct elf_phdr *eppnt;
1029
	unsigned long elf_bss, bss, len;
1030
	unsigned long elf_bss, bss, len;
1030
	int retval, error, i, j;
1031
	int retval, error, i, j;
1031
	struct elfhdr elf_ex;
1032
	struct elfhdr elf_ex;
Lines 1049-1092 static int load_elf_library(struct file Link Here
1049
	/* j < ELF_MIN_ALIGN because elf_ex.e_phnum <= 2 */
1050
	/* j < ELF_MIN_ALIGN because elf_ex.e_phnum <= 2 */
1050
1051
1051
	error = -ENOMEM;
1052
	error = -ENOMEM;
1052
	elf_phdata = (struct elf_phdr *) kmalloc(j, GFP_KERNEL);
1053
	elf_phdata = kmalloc(j, GFP_KERNEL);
1053
	if (!elf_phdata)
1054
	if (!elf_phdata)
1054
		goto out;
1055
		goto out;
1055
1056
1057
	eppnt = elf_phdata;
1056
	error = -ENOEXEC;
1058
	error = -ENOEXEC;
1057
	retval = kernel_read(file, elf_ex.e_phoff, (char *) elf_phdata, j);
1059
	retval = kernel_read(file, elf_ex.e_phoff, (char *)eppnt, j);
1058
	if (retval != j)
1060
	if (retval != j)
1059
		goto out_free_ph;
1061
		goto out_free_ph;
1060
1062
1061
	for (j = 0, i = 0; i<elf_ex.e_phnum; i++)
1063
	for (j = 0, i = 0; i<elf_ex.e_phnum; i++)
1062
		if ((elf_phdata + i)->p_type == PT_LOAD) j++;
1064
		if ((eppnt + i)->p_type == PT_LOAD)
1065
			j++;
1063
	if (j != 1)
1066
	if (j != 1)
1064
		goto out_free_ph;
1067
		goto out_free_ph;
1065
1068
1066
	while (elf_phdata->p_type != PT_LOAD) elf_phdata++;
1069
	while (eppnt->p_type != PT_LOAD)
1070
		eppnt++;
1067
1071
1068
	/* Now use mmap to map the library into memory. */
1072
	/* Now use mmap to map the library into memory. */
1069
	down_write(&current->mm->mmap_sem);
1073
	down_write(&current->mm->mmap_sem);
1070
	error = do_mmap(file,
1074
	error = do_mmap(file,
1071
			ELF_PAGESTART(elf_phdata->p_vaddr),
1075
			ELF_PAGESTART(eppnt->p_vaddr),
1072
			(elf_phdata->p_filesz +
1076
			(eppnt->p_filesz +
1073
			 ELF_PAGEOFFSET(elf_phdata->p_vaddr)),
1077
			 ELF_PAGEOFFSET(eppnt->p_vaddr)),
1074
			PROT_READ | PROT_WRITE | PROT_EXEC,
1078
			PROT_READ | PROT_WRITE | PROT_EXEC,
1075
			MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,
1079
			MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE,
1076
			(elf_phdata->p_offset -
1080
			(eppnt->p_offset -
1077
			 ELF_PAGEOFFSET(elf_phdata->p_vaddr)));
1081
			 ELF_PAGEOFFSET(eppnt->p_vaddr)));
1078
	up_write(&current->mm->mmap_sem);
1082
	up_write(&current->mm->mmap_sem);
1079
	if (error != ELF_PAGESTART(elf_phdata->p_vaddr))
1083
	if (error != ELF_PAGESTART(eppnt->p_vaddr))
1080
		goto out_free_ph;
1084
		goto out_free_ph;
1081
1085
1082
	elf_bss = elf_phdata->p_vaddr + elf_phdata->p_filesz;
1086
	elf_bss = eppnt->p_vaddr + eppnt->p_filesz;
1083
	if (padzero(elf_bss)) {
1087
	if (padzero(elf_bss)) {
1084
		error = -EFAULT;
1088
		error = -EFAULT;
1085
		goto out_free_ph;
1089
		goto out_free_ph;
1086
	}
1090
	}
1087
1091
1088
	len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
1092
	len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr + ELF_MIN_ALIGN - 1);
1089
	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
1093
	bss = eppnt->p_memsz + eppnt->p_vaddr;
1090
	if (bss > len) {
1094
	if (bss > len) {
1091
		down_write(&current->mm->mmap_sem);
1095
		down_write(&current->mm->mmap_sem);
1092
		do_brk(len, bss - len);
1096
		do_brk(len, bss - len);

Return to bug 73837