diff options
| author | Rom Lemarchand <romlem@android.com> | 2015-03-07 09:33:41 -0800 |
|---|---|---|
| committer | Rom Lemarchand <romlem@google.com> | 2015-03-09 19:38:56 -0700 |
| commit | 4f1d2937133c62cd7d5228960e9cdfb175522072 (patch) | |
| tree | b83afa5a889879f20fe3ff78d7c2cd04ec75ab44 /fs/proc | |
| parent | 740006ef285f77b02b016b9a21453e56db1915ed (diff) | |
Revert "Grants system server access to /proc/<pid>/oom_adj for Android applications."
This reverts commit aa3305f2ba5976a95637c69c63409fdf007e1414.
Bug: 19636629
Change-Id: I8dcd6a12cc591cb410d6a799c7e875726495504f
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/base.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index 2d00fdde9345..c3834dad09b3 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -139,12 +139,6 @@ struct pid_entry { NULL, &proc_single_file_operations, \ { .proc_show = show } ) -/* ANDROID is for special files in /proc. */ -#define ANDROID(NAME, MODE, OTYPE) \ - NOD(NAME, (S_IFREG|(MODE)), \ - &proc_##OTYPE##_inode_operations, \ - &proc_##OTYPE##_operations, {}) - /* * Count the number of hardlinks for the pid_entry table, excluding the . * and .. links. @@ -1006,35 +1000,6 @@ out: return err < 0 ? err : count; } -static int oom_adjust_permission(struct inode *inode, int mask) -{ - uid_t uid; - struct task_struct *p; - - p = get_proc_task(inode); - if(p) { - uid = task_uid(p); - put_task_struct(p); - } - - /* - * System Server (uid == 1000) is granted access to oom_adj of all - * android applications (uid > 10000) as and services (uid >= 1000) - */ - if (p && (current_fsuid() == 1000) && (uid >= 1000)) { - if (inode->i_mode >> 6 & mask) { - return 0; - } - } - - /* Fall back to default. */ - return generic_permission(inode, mask); -} - -static const struct inode_operations proc_oom_adj_inode_operations = { - .permission = oom_adjust_permission, -}; - static const struct file_operations proc_oom_adj_operations = { .read = oom_adj_read, .write = oom_adj_write, @@ -2732,7 +2697,7 @@ static const struct pid_entry tgid_base_stuff[] = { REG("cgroup", S_IRUGO, proc_cgroup_operations), #endif INF("oom_score", S_IRUGO, proc_oom_score), - ANDROID("oom_adj", S_IRUGO|S_IWUSR, oom_adj), + REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations), REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), #ifdef CONFIG_AUDITSYSCALL REG("loginuid", S_IWUSR|S_IRUGO, proc_loginuid_operations), |