From fc7972f8db98e619ad3dca9fe88c2b21918418cd Mon Sep 17 00:00:00 2001 From: Saravana Kannan Date: Fri, 7 Aug 2020 13:12:18 -0700 Subject: [PATCH] ANDROID: Revert "module: Do not expose section addresses to non-CAP_SYSLOG" This reverts commit 314ac273f005b8077c272a9439ab21bd74dc80d2 as it breaks ramdump debug tools. Will bring this back in after resolving those issues. Bug: 163100336 Change-Id: Ibf46f6db0fa2bf9cc9e7121115889e15ca07cdab Signed-off-by: Saravana Kannan Git-commit: d837f090a69e698ea08e9c428c05d015c20470e7 Git-repo: https://android.googlesource.com/kernel/common/ Signed-off-by: Prasad Sodagudi --- kernel/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 47a5d06b1a5e..c6a09bbf0324 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1526,8 +1526,8 @@ static ssize_t module_sect_read(struct file *file, struct kobject *kobj, if (pos != 0) return -EINVAL; - return sprintf(buf, "0x%px\n", - kallsyms_show_value(file->f_cred) ? (void *)sattr->address : NULL); + return sprintf(buf, "0x%px\n", kptr_restrict < 2 ? + (void *)sattr->address : NULL); } static void free_sect_attrs(struct module_sect_attrs *sect_attrs) @@ -4420,7 +4420,7 @@ static int modules_open(struct inode *inode, struct file *file) if (!err) { struct seq_file *m = file->private_data; - m->private = kallsyms_show_value(file->f_cred) ? NULL : (void *)8ul; + m->private = kallsyms_show_value(current_cred()) ? NULL : (void *)8ul; } return err;