Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9d09d2ae41b4
Choose a base ref
...
head repository: mobile-nixos/mobile-nixos
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0ad7247a5392
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Oct 10, 2019

  1. asus-z00t: update kernel to latest lineageos revision

    @samueldr
    samueldr committed Oct 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    nolmoonen Nol Moonen
    GPG key ID: 486F753FC25B6289
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ff5de40 View commit details

  2. asus-z00t: Enable USER_NS

    @samueldr
    samueldr committed Oct 10, 2019
    Copy the full SHA
    0b875aa View commit details

  3. asus-z00t: Fixes compilation with USER_NS 

    This is dumb... These are all android/google/qualcomm/asus "features"
added to the kernel with no concern about actually being compatible
with the kernel. They all assume no USER_NS stuff.

Fun!
    @samueldr
    samueldr committed Oct 10, 2019
    Copy the full SHA
    fb79113 View commit details

Commits on Nov 19, 2019

  1. Merge pull request #37 from samueldr-wip/device/asus-z00t-userns 

    asus-z00t: Enable USER_NS
    @samueldr
    samueldr authored Nov 19, 2019
    Copy the full SHA
    0ad7247 View commit details
76 changes: 76 additions & 0 deletions devices/asus-z00t/kernel/0001-Revert-Grants-system-server-access-to-proc-pid-oom_a.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
From 1f49c9dd4d5074f15de3231d08435e2d02c62534 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 9 Oct 2019 20:50:37 -0400
Subject: [PATCH] Revert "Grants system server access to /proc/<pid>/oom_adj
for Android applications."

This reverts commit aa3305f2ba5976a95637c69c63409fdf007e1414.
---
fs/proc/base.c | 37 +------------------------------------
1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 870abad7717..174364d1314 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.
@@ -1012,35 +1006,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,
@@ -2793,7 +2758,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),
--
2.23.0

Loading