fs/binfmt_elf.c: save 1 indent level (be0deb58) · Commits · 戴 / test

fs/binfmt_elf.c

+54 −57

Original line number	Diff line number	Diff line
		@@ -740,23 +740,23 @@ static int load_elf_binary(struct linux_binprm *bprm)
		start_data = 0;
		end_data = 0;

		for (i = 0; i < loc->elf_ex.e_phnum; i++) {
		if (elf_ppnt->p_type == PT_INTERP) {
		for (i = 0; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) {
		char *elf_interpreter;
		loff_t pos;

		/* This is the program interpreter used for
		* shared libraries - for now assume that this
		* is an a.out format binary
		if (elf_ppnt->p_type != PT_INTERP)
		continue;

		/*
		* This is the program interpreter used for shared libraries -
		* for now assume that this is an a.out format binary.
		*/
		retval = -ENOEXEC;
		if (elf_ppnt->p_filesz > PATH_MAX \|\|
		elf_ppnt->p_filesz < 2)
		if (elf_ppnt->p_filesz > PATH_MAX \|\| elf_ppnt->p_filesz < 2)
		goto out_free_ph;

		retval = -ENOMEM;
		elf_interpreter = kmalloc(elf_ppnt->p_filesz,
		GFP_KERNEL);
		elf_interpreter = kmalloc(elf_ppnt->p_filesz, GFP_KERNEL);
		if (!elf_interpreter)
		goto out_free_ph;

		@@ -780,9 +780,8 @@ static int load_elf_binary(struct linux_binprm *bprm)
		goto out_free_ph;

		/*
		* If the binary is not readable then enforce
		* mm->dumpable = 0 regardless of the interpreter's
		* permissions.
		* If the binary is not readable then enforce mm->dumpable = 0
		* regardless of the interpreter's permissions.
		*/
		would_dump(bprm, interpreter);

		@@ -802,8 +801,6 @@ out_free_interp:
		kfree(elf_interpreter);
		goto out_free_ph;
		}
		elf_ppnt++;
		}

		elf_ppnt = elf_phdata;
		for (i = 0; i < loc->elf_ex.e_phnum; i++, elf_ppnt++)