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

Commit af521f92 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Greg Ungerer
Browse files

binfmt_flat: update libraries' data segment pointer with userspace accessors 



This is needed on systems with a MMU.  This also gets rid of the
strangest C code I've seen lateli i.e. an integer indexed with a
pointer value within square brackets. That really looked backwards.

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Reviewed-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Signed-off-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent 467aa146

fs/binfmt_flat.c

+13 −6
Original line number Diff line number Diff line
@@ -894,12 +894,19 @@ static int load_flat_binary(struct linux_binprm *bprm) 
		return res;



	/* Update data segment pointers for all libraries */

	for (i = 0; i < MAX_SHARED_LIBS; i++)

		if (libinfo.lib_list[i].loaded)

			for (j = 0; j < MAX_SHARED_LIBS; j++)

				(-(j+1))[(unsigned long *)(libinfo.lib_list[i].start_data)] =

					(libinfo.lib_list[j].loaded) ?

	for (i = 0; i < MAX_SHARED_LIBS; i++) {

		if (!libinfo.lib_list[i].loaded)

			continue;

		for (j = 0; j < MAX_SHARED_LIBS; j++) {

			unsigned long val = libinfo.lib_list[j].loaded ?

				libinfo.lib_list[j].start_data : UNLOADED_LIB;

			unsigned long __user *p = (unsigned long __user *)

				libinfo.lib_list[i].start_data;

			p -= j + 1;

			if (put_user(val, p))

				return -EFAULT;

		}

	}



	install_exec_creds(bprm);