From 44c13f4537df5fee4cab1e30ccde819085c0bf83 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 3 Sep 2020 14:22:21 +0200 Subject: [PATCH] Revert "ANDROID: Revert "module: Do not expose section addresses to non-CAP_SYSLOG"" This reverts commit d837f090a69e698ea08e9c428c05d015c20470e7 as the ramdump tooling is now fixed. Bug: 163100336 Cc: Saravana Kannan Signed-off-by: Greg Kroah-Hartman Change-Id: I4d0917beb848563270343515c49e0d6ad055c917 --- kernel/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index c6a09bbf0324..47a5d06b1a5e 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", kptr_restrict < 2 ? - (void *)sattr->address : NULL); + return sprintf(buf, "0x%px\n", + kallsyms_show_value(file->f_cred) ? (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(current_cred()) ? NULL : (void *)8ul; + m->private = kallsyms_show_value(file->f_cred) ? NULL : (void *)8ul; } return err;