Merge android14-6.1-2024-05_r7 into HEAD
* commit 'cec7ba95d3c762385a9e6310061752676c99c493': ANDROID: 16K: Only check basename of linker context Change-Id: If0b7d0026d427b206bb5b269e2ebf41108cda5a1 Signed-off-by: keystone-kernel-automerger <keystone-kernel-automerger@google.com>
This commit is contained in:
commit
e827132921
@ -18,6 +18,7 @@
|
||||
#include <linux/kstrtox.h>
|
||||
#include <linux/sched/task_stack.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/sysfs.h>
|
||||
|
||||
typedef void (*show_pad_maps_fn) (struct seq_file *m, struct vm_area_struct *vma);
|
||||
@ -182,7 +183,15 @@ static inline bool linker_ctx(void)
|
||||
memset(buf, 0, bufsize);
|
||||
path = d_path(&file->f_path, buf, bufsize);
|
||||
|
||||
if (!strcmp(path, "/system/bin/linker64"))
|
||||
/*
|
||||
* Depending on interpreter requested, valid paths could be any of:
|
||||
* 1. /system/bin/bootstrap/linker64
|
||||
* 2. /system/bin/linker64
|
||||
* 3. /apex/com.android.runtime/bin/linker64
|
||||
*
|
||||
* Check the base name (linker64).
|
||||
*/
|
||||
if (!strcmp(kbasename(path), "linker64"))
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user