diff options
| author | Mike Chan <mikechan@google.com> | 2008-04-24 10:22:26 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-09-29 17:49:11 -0700 |
| commit | 114e891fc7589f3e49c0b255e57f0581c62b4442 (patch) | |
| tree | c0bb8e9362e10de09bd8d4894d0c40471de908c8 /fs | |
| parent | a340c3dd139246416374d2243031810ecee8269c (diff) | |
Grants system server access to /proc/<pid>/oom_adj for Android applications.
Signed-off-by: Brian Swetland <swetland@google.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/base.c | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index a1c43e7c8a7b..98b902d424da 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -130,6 +130,12 @@ 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. @@ -1071,6 +1077,33 @@ static ssize_t oom_adjust_write(struct file *file, const char __user *buf, return count; } +static int oom_adjust_permission(struct inode *inode, int mask) +{ + uid_t uid; + struct task_struct *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, NULL); +} + +static const struct inode_operations proc_oom_adjust_inode_operations = { + .permission = oom_adjust_permission, +}; + static const struct file_operations proc_oom_adjust_operations = { .read = oom_adjust_read, .write = oom_adjust_write, @@ -2724,7 +2757,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), - REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adjust_operations), + ANDROID("oom_adj",S_IRUGO|S_IWUSR, oom_adjust), 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), |