diff options
| author | Greg Hackmann <ghackmann@google.com> | 2018-04-02 14:03:43 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-05-20 16:40:16 +0530 |
| commit | 6d12019ad64b12f0256187a2baa44776694fd118 (patch) | |
| tree | 759a21b3d7d924c0a7e64823ea3e6e3271504fea /fs/proc | |
| parent | 4448b2ce7804d0f67eb65586deba8203854f9a0b (diff) | |
Revert "proc: make oom adjustment files user read-only"
CTS no longer expects oom_{adj,score_adj} to be read-only. See
https://android-review.googlesource.com/530687/ for additional context.
This reverts commit 55541f1ac36fbb6edd94273cab21d69a82d31519.
Bug: 63142211
Change-Id: I8011b4389b17d9577a6aff08943d0021e990171b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/base.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/proc/base.c b/fs/proc/base.c index f558b4bd5d6a..440ec5f00214 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -2877,9 +2877,8 @@ static const struct pid_entry tgid_base_stuff[] = { ONE("cgroup", S_IRUGO, proc_cgroup_show), #endif ONE("oom_score", S_IRUGO, proc_oom_score), - INF("oom_score", S_IRUGO, proc_oom_score), - REG("oom_adj", S_IRUSR, proc_oom_adj_operations), - REG("oom_score_adj", S_IRUSR, proc_oom_score_adj_operations), + 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), REG("sessionid", S_IRUGO, proc_sessionid_operations), @@ -3272,8 +3271,8 @@ static const struct pid_entry tid_base_stuff[] = { ONE("cgroup", S_IRUGO, proc_cgroup_show), #endif ONE("oom_score", S_IRUGO, proc_oom_score), - REG("oom_adj", S_IRUSR, proc_oom_adj_operations), - REG("oom_score_adj", S_IRUSR, proc_oom_score_adj_operations), + 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), REG("sessionid", S_IRUGO, proc_sessionid_operations), |