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

Commit b6982cb0 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'android-3.18' of ../../android/aosp into linux-linaro-lsk-v3.18-android 

* 'android-3.18' of ../../android/aosp:
  ANDROID: exec_domains: Disable request_module() call for personalities
  UPSTREAM: pagemap: do not leak physical addresses to non-privileged userspace
parents 6679a18a a9ac1262

kernel/exec_domain.c

+8 −1
Original line number Diff line number Diff line
@@ -68,7 +68,14 @@ lookup_exec_domain(unsigned int personality) 
				goto out;

	}



#ifdef CONFIG_MODULES

/*

 * Disable the request_module here to avoid trying to

 * load the personality-8 module, which  doesn't exist,

 * and results in selinux audit noise.

 * Disabling this here avoids folks adding module_request

 * to their sepolicy, which is maybe too generous

 */

#if 0

	read_unlock(&exec_domains_lock);

	request_module("personality-%d", pers);

	read_lock(&exec_domains_lock);