diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index 6dc6b3a8..18f289ea 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -94,6 +94,7 @@ + diff --git a/Manifests/Manifest_LAOS-16.0.xml b/Manifests/Manifest_LAOS-16.0.xml index b6d85a1d..1b1da52b 100644 --- a/Manifests/Manifest_LAOS-16.0.xml +++ b/Manifests/Manifest_LAOS-16.0.xml @@ -100,6 +100,7 @@ + diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml index a0060b84..8338401d 100644 --- a/Manifests/Manifest_LAOS-17.1.xml +++ b/Manifests/Manifest_LAOS-17.1.xml @@ -96,6 +96,7 @@ + diff --git a/Patches/LineageOS-14.1/android_system_core/0001-Harden.patch b/Patches/LineageOS-14.1/android_system_core/0001-Harden.patch index 620be786..a4f83c88 100644 --- a/Patches/LineageOS-14.1/android_system_core/0001-Harden.patch +++ b/Patches/LineageOS-14.1/android_system_core/0001-Harden.patch @@ -1,13 +1,13 @@ -From 22342a49f43d2d7613d12603ec99d75dc2ceb6eb Mon Sep 17 00:00:00 2001 +From edd233257b7a76ff0e1f6251339caccbc7c5afbd Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 28 Jun 2017 07:54:49 -0400 Subject: [PATCH] Harden Change-Id: I46e3fc4ac896a509ab8ca90ae4ce09b820da434b --- - init/init.cpp | 6 +++--- - rootdir/init.rc | 8 ++++++++ - 2 files changed, 11 insertions(+), 3 deletions(-) + init/init.cpp | 6 +++--- + rootdir/init.rc | 12 ++++++++++++ + 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/init/init.cpp b/init/init.cpp index 7a370596e..35bf44a7b 100755 @@ -27,9 +27,11 @@ index 7a370596e..35bf44a7b 100755 } // We must have some place other than / to create the device nodes for +diff --git a/rootdir/init.rc b/rootdir/init.rc +index 40a36402e..0ee5f3e67 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc -@@ -126,7 +126,18 @@ on init +@@ -126,6 +126,18 @@ on init write /proc/sys/kernel/sched_child_runs_first 0 write /proc/sys/kernel/randomize_va_space 2 @@ -49,5 +51,5 @@ index 7a370596e..35bf44a7b 100755 write /proc/sys/vm/mmap_min_addr 32768 write /proc/sys/net/ipv4/ping_group_range "0 2147483647" -- -2.21.0 +2.26.2 diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 04990a1f..2cc52d8c 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -115,7 +115,6 @@ export -f buildAll; patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi; source build/envsetup.sh; - #repopick 214125; #spellchecker: enable more wordlists repopick -it n_asb_09-2018-qcom; repopick -it ibss-mode-nougat; repopick -i 280667 280668 280669; #n-asb-2020-07 diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 824fe790..894726cf 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -184,7 +184,7 @@ patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES_COMMON/android_system_core/0001-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS) enterAndClear "system/netd"; -git am "$DOS_PATCHES/android_system_netd/*.patch"; #n-netd +git am $DOS_PATCHES/android_system_netd/*.patch; #n-netd enterAndClear "system/sepolicy"; patch -p1 < "$DOS_PATCHES/android_system_sepolicy/248600.patch"; #restrict access to timing information in /proc