Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-09-20 16:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup + Churn

Browse Source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-06-13 18:29:22 -04:00
parent 3096e8ad9e
commit 7357b970ef
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
35 changed files with 69 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Patches/LineageOS-14.1/android_frameworks_base/393646.patch
View File

@ -1,4 +1,4 @@
From 2786005045df9d37fc4de14e5e4f60b9d5ec59b7 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com> From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 26 Mar 2024 10:31:44 -0700 Date: Tue, 26 Mar 2024 10:31:44 -0700
Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService. Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService.
@ -14,10 +14,10 @@ Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297
1 file changed, 10 insertions(+) 1 file changed, 10 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 126955add01a9..6ae79ec2e4aaa 100644 index b28e532c01bb..77fd4a8d6054 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java --- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -2971,6 +2971,11 @@ public void onResult(Bundle result) { @@ -3002,6 +3002,11 @@ public class AccountManagerService
// Strip auth token from result. // Strip auth token from result.
result.remove(AccountManager.KEY_AUTHTOKEN); result.remove(AccountManager.KEY_AUTHTOKEN);
@ -29,7 +29,7 @@ index 126955add01a9..6ae79ec2e4aaa 100644
if (Log.isLoggable(TAG, Log.VERBOSE)) { if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG, Log.v(TAG,
@@ -4402,6 +4407,11 @@ public void onResult(Bundle result) { @@ -4493,6 +4498,11 @@ public class AccountManagerService
} else { } else {
if (mStripAuthTokenFromResult) { if (mStripAuthTokenFromResult) {
result.remove(AccountManager.KEY_AUTHTOKEN); result.remove(AccountManager.KEY_AUTHTOKEN);

9
Patches/LineageOS-14.1/android_frameworks_base/393647.patch
View File

@ -1,8 +1,7 @@
From 1595b95840ad55128edacd32996afb954480aefd Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Wailes <chriswailes@google.com> From: Chris Wailes <chriswailes@google.com>
Date: Thu, 18 Apr 2019 18:25:57 -0700 Date: Thu, 18 Apr 2019 18:25:57 -0700
Subject: [PATCH] [BACKPORT] Adds additional sanitization for Zygote command Subject: [PATCH] Adds additional sanitization for Zygote command arguments.
arguments.
Previously we were only insuring that the arguments provided to the Previously we were only insuring that the arguments provided to the
Zygote didn't contain any newlines. This adds additional checks for Zygote didn't contain any newlines. This adds additional checks for
@ -19,7 +18,7 @@ Merged-In: I4055c50d52db0047c02c11096710fd07b429660c
1 file changed, 7 insertions(+), 2 deletions(-) 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index e1b7fdad25e7d..1e084529de6e5 100644 index e1b7fdad25e7..1e084529de6e 100644
--- a/core/java/android/os/Process.java --- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
@ -30,7 +29,7 @@ index e1b7fdad25e7d..1e084529de6e5 100644
import android.annotation.TestApi; import android.annotation.TestApi;
import android.net.LocalSocket; import android.net.LocalSocket;
import android.net.LocalSocketAddress; import android.net.LocalSocketAddress;
@@ -564,15 +565,19 @@ private static String getAbiList(BufferedWriter writer, DataInputStream inputStr @@ -564,15 +565,19 @@ public class Process {
* @throws ZygoteStartFailedEx if process start failed for any reason * @throws ZygoteStartFailedEx if process start failed for any reason
*/ */
private static ProcessStartResult zygoteSendArgsAndGetResult( private static ProcessStartResult zygoteSendArgsAndGetResult(

8
Patches/LineageOS-14.1/android_frameworks_base/393648.patch
View File

@ -1,7 +1,7 @@
From 556cc034e359fd1bb64a1b16ebe7a61f06810bcb Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hans Boehm <hboehm@google.com> From: Hans Boehm <hboehm@google.com>
Date: Tue, 2 Jan 2024 16:53:13 -0800 Date: Tue, 2 Jan 2024 16:53:13 -0800
Subject: [PATCH] [BACKPORT] Check hidden API exemptions Subject: [PATCH] Check hidden API exemptions
Refuse to deal with newlines and null characters in Refuse to deal with newlines and null characters in
HiddenApiSettings.update(). Also disallow nulls in process start HiddenApiSettings.update(). Also disallow nulls in process start
@ -18,10 +18,10 @@ Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 1e084529de6e5..de8287baa828b 100644 index 1e084529de6e..de8287baa828 100644
--- a/core/java/android/os/Process.java --- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java
@@ -578,6 +578,8 @@ private static ProcessStartResult zygoteSendArgsAndGetResult( @@ -578,6 +578,8 @@ public class Process {
throw new ZygoteStartFailedEx("Embedded newlines not allowed"); throw new ZygoteStartFailedEx("Embedded newlines not allowed");
} else if (args.get(i).indexOf('\r') >= 0) { } else if (args.get(i).indexOf('\r') >= 0) {
throw new ZygoteStartFailedEx("Embedded carriage returns not allowed"); throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");

12
Patches/LineageOS-14.1/android_frameworks_base/393649.patch
View File

@ -1,8 +1,8 @@
From 53abf79f26084d26d2887d716137fa9cd4eeefc9 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ameer Armaly <aarmaly@google.com> From: Ameer Armaly <aarmaly@google.com>
Date: Fri, 8 Mar 2024 19:41:06 +0000 Date: Fri, 8 Mar 2024 19:41:06 +0000
Subject: [PATCH] [RESTRICT AUTOMERGE] AccessibilityManagerService: remove Subject: [PATCH] AccessibilityManagerService: remove uninstalled services from
uninstalled services from enabled list after service update. enabled list after service update.
Bug: 326485767 Bug: 326485767
Test: atest AccessibilityEndToEndTest#testUpdateServiceWithoutIntent_disablesService Test: atest AccessibilityEndToEndTest#testUpdateServiceWithoutIntent_disablesService
@ -16,10 +16,10 @@ Change-Id: I898044b388399bded66acb22dba55c5df26ccc9f
1 file changed, 22 insertions(+) 1 file changed, 22 insertions(+)
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index 34ccb7b82c87c..38cf47a5d87b9 100644 index cae1adcafc23..b030dd4f6ead 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1294,10 +1294,13 @@ private void updateServicesLocked(UserState userState) { @@ -1302,10 +1302,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
boolean isUnlockingOrUnlocked = mContext.getSystemService(UserManager.class) boolean isUnlockingOrUnlocked = mContext.getSystemService(UserManager.class)
.isUserUnlockingOrUnlocked(userState.mUserId); .isUserUnlockingOrUnlocked(userState.mUserId);
@ -33,7 +33,7 @@ index 34ccb7b82c87c..38cf47a5d87b9 100644
Service service = componentNameToServiceMap.get(componentName); Service service = componentNameToServiceMap.get(componentName);
@@ -1325,6 +1328,25 @@ private void updateServicesLocked(UserState userState) { @@ -1333,6 +1336,25 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
} }
} }

26
Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-1.patch
View File

@ -9,10 +9,10 @@ Ported from 12: b294a2ce1d0d185dbc438ac3c06c90386d5f5949
1 file changed, 30 insertions(+), 9 deletions(-) 1 file changed, 30 insertions(+), 9 deletions(-)
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index 8dadd3190ac3..b1de8d8a5830 100644 index 96c34db79898..9fd704ac7d44 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -1409,7 +1409,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -1410,7 +1410,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
// their permissions as always granted runtime ones since we need // their permissions as always granted runtime ones since we need
// to keep the review required permission flag per user while an // to keep the review required permission flag per user while an
// install permission's state is shared across all users. // install permission's state is shared across all users.
@ -22,7 +22,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
return; return;
} }
@@ -1452,7 +1453,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -1453,7 +1454,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
+ " for package " + packageName); + " for package " + packageName);
} }
@ -32,7 +32,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
Slog.w(TAG, "Cannot grant runtime permission to a legacy app"); Slog.w(TAG, "Cannot grant runtime permission to a legacy app");
return; return;
} }
@@ -1598,7 +1600,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -1599,7 +1601,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
// their permissions as always granted runtime ones since we need // their permissions as always granted runtime ones since we need
// to keep the review required permission flag per user while an // to keep the review required permission flag per user while an
// install permission's state is shared across all users. // install permission's state is shared across all users.
@ -42,7 +42,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
return; return;
} }
@@ -1785,7 +1788,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -1786,7 +1789,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
// permission as requiring a review as this is the initial state. // permission as requiring a review as this is the initial state.
final int uid = mPackageManagerInt.getPackageUid(packageName, 0, userId); final int uid = mPackageManagerInt.getPackageUid(packageName, 0, userId);
final int targetSdk = mPackageManagerInt.getUidTargetSdkVersion(uid); final int targetSdk = mPackageManagerInt.getUidTargetSdkVersion(uid);
@ -52,7 +52,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
? FLAG_PERMISSION_REVIEW_REQUIRED | FLAG_PERMISSION_REVOKED_COMPAT ? FLAG_PERMISSION_REVIEW_REQUIRED | FLAG_PERMISSION_REVOKED_COMPAT
: 0; : 0;
@@ -1805,7 +1809,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -1806,7 +1810,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
// If this permission was granted by default or role, make sure it is. // If this permission was granted by default or role, make sure it is.
if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0 if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0
@ -62,7 +62,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
// PermissionPolicyService will handle the app op for runtime permissions later. // PermissionPolicyService will handle the app op for runtime permissions later.
grantRuntimePermissionInternal(packageName, permName, false, grantRuntimePermissionInternal(packageName, permName, false,
Process.SYSTEM_UID, userId, delayingPermCallback); Process.SYSTEM_UID, userId, delayingPermCallback);
@@ -2518,6 +2523,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2519,6 +2524,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} }
} }
@ -73,7 +73,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
/** /**
* Restore the permission state for a package. * Restore the permission state for a package.
* *
@@ -2642,6 +2651,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2643,6 +2652,8 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
synchronized (mLock) { synchronized (mLock) {
for (final int userId : userIds) { for (final int userId : userIds) {
final UserPermissionState userState = mState.getOrCreateUserState(userId); final UserPermissionState userState = mState.getOrCreateUserState(userId);
@ -82,7 +82,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
final UidPermissionState uidState = userState.getOrCreateUidState(ps.getAppId()); final UidPermissionState uidState = userState.getOrCreateUidState(ps.getAppId());
if (uidState.isMissing()) { if (uidState.isMissing()) {
@@ -2658,7 +2669,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2659,7 +2670,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT, FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT,
FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT); FLAG_PERMISSION_RESTRICTION_UPGRADE_EXEMPT);
} }
@ -91,7 +91,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
uidState.updatePermissionFlags(permission, uidState.updatePermissionFlags(permission,
PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED
| PackageManager.FLAG_PERMISSION_REVOKED_COMPAT, | PackageManager.FLAG_PERMISSION_REVOKED_COMPAT,
@@ -2854,7 +2865,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2855,7 +2866,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
boolean restrictionApplied = (origState.getPermissionFlags( boolean restrictionApplied = (origState.getPermissionFlags(
bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0; bp.getName()) & FLAG_PERMISSION_APPLY_RESTRICTION) != 0;
@ -100,7 +100,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
// If hard restricted we don't allow holding it // If hard restricted we don't allow holding it
if (permissionPolicyInitialized && hardRestricted) { if (permissionPolicyInitialized && hardRestricted) {
if (!restrictionExempt) { if (!restrictionExempt) {
@@ -2907,6 +2918,16 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2908,6 +2919,16 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} }
} }
} }
@ -117,7 +117,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
} else { } else {
if (origPermState == null) { if (origPermState == null) {
// New permission // New permission
@@ -2941,7 +2962,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2942,7 +2963,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
if (restrictionApplied) { if (restrictionApplied) {
flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION; flags &= ~FLAG_PERMISSION_APPLY_RESTRICTION;
// Dropping restriction on a legacy app implies a review // Dropping restriction on a legacy app implies a review
@ -126,7 +126,7 @@ index 8dadd3190ac3..b1de8d8a5830 100644
flags |= FLAG_PERMISSION_REVIEW_REQUIRED; flags |= FLAG_PERMISSION_REVIEW_REQUIRED;
} }
wasChanged = true; wasChanged = true;
@@ -3658,7 +3679,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -3659,7 +3680,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
if (shouldGrantPermission) { if (shouldGrantPermission) {
final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission, final int flags = getPermissionFlagsInternal(pkg.getPackageName(), permission,
myUid, userId); myUid, userId);

4
Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-10.patch
View File

@ -9,10 +9,10 @@ Subject: [PATCH] srt permissions: don't auto-grant denied ones when
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index 29658387fed4..5d2bb41c4b4d 100644 index f4064d1ab984..556443b40c3d 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -1810,7 +1810,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -1811,7 +1811,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
// If this permission was granted by default or role, make sure it is. // If this permission was granted by default or role, make sure it is.
if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0 if ((oldFlags & FLAG_PERMISSION_GRANTED_BY_DEFAULT) != 0
|| (oldFlags & FLAG_PERMISSION_GRANTED_BY_ROLE) != 0 || (oldFlags & FLAG_PERMISSION_GRANTED_BY_ROLE) != 0

4
Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-2.patch
View File

@ -67,10 +67,10 @@ index 2091c0502b6f..4c45fdc4de44 100644
<string name="capability_title_canRetrieveWindowContent">Retrieve window content</string> <string name="capability_title_canRetrieveWindowContent">Retrieve window content</string>
<!-- Description for the capability of an accessibility service to retrieve window content. --> <!-- Description for the capability of an accessibility service to retrieve window content. -->
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index b1de8d8a5830..6ea489ce05b6 100644 index 9fd704ac7d44..fde265d12bf9 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -2524,7 +2524,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2525,7 +2525,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} }
public static boolean isSpecialRuntimePermission(final String permission) { public static boolean isSpecialRuntimePermission(final String permission) {

4
Patches/LineageOS-20.0/android_frameworks_base/0013-Special_Permissions-3.patch
View File

@ -86,10 +86,10 @@ index 4c45fdc4de44..e0ca922bf686 100644
<string name="permlab_readCalendar">Read calendar events and details</string> <string name="permlab_readCalendar">Read calendar events and details</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index 6ea489ce05b6..29658387fed4 100644 index fde265d12bf9..f4064d1ab984 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -2524,7 +2524,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2525,7 +2525,7 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} }
public static boolean isSpecialRuntimePermission(final String permission) { public static boolean isSpecialRuntimePermission(final String permission) {

6
Patches/LineageOS-20.0/android_frameworks_base/0039-package_hooks.patch
View File

@ -159,7 +159,7 @@ index a9b624653b92..9cac3e75a698 100644
ATTR_ENABLED_CALLER); ATTR_ENABLED_CALLER);
final String harmfulAppWarning = final String harmfulAppWarning =
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
index 5d2bb41c4b4d..fae8dc90371a 100644 index 556443b40c3d..ac5aadd45467 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java --- a/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
@@ -127,6 +127,7 @@ import com.android.server.LocalServices; @@ -127,6 +127,7 @@ import com.android.server.LocalServices;
@ -170,7 +170,7 @@ index 5d2bb41c4b4d..fae8dc90371a 100644
import com.android.server.pm.ApexManager; import com.android.server.pm.ApexManager;
import com.android.server.pm.KnownPackages; import com.android.server.pm.KnownPackages;
import com.android.server.pm.UserManagerInternal; import com.android.server.pm.UserManagerInternal;
@@ -1363,6 +1364,13 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -1364,6 +1365,13 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
isRolePermission = permission.isRole(); isRolePermission = permission.isRole();
isSoftRestrictedPermission = permission.isSoftRestricted(); isSoftRestrictedPermission = permission.isSoftRestricted();
} }
@ -184,7 +184,7 @@ index 5d2bb41c4b4d..fae8dc90371a 100644
final boolean mayGrantRolePermission = isRolePermission final boolean mayGrantRolePermission = isRolePermission
&& mayManageRolePermission(callingUid); && mayManageRolePermission(callingUid);
final boolean mayGrantSoftRestrictedPermission = isSoftRestrictedPermission final boolean mayGrantSoftRestrictedPermission = isSoftRestrictedPermission
@@ -2982,6 +2990,11 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt @@ -2983,6 +2991,11 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
Slog.wtf(LOG_TAG, "Unknown permission protection " + bp.getProtection() Slog.wtf(LOG_TAG, "Unknown permission protection " + bp.getProtection()
+ " for permission " + bp.getName()); + " for permission " + bp.getName());
} }

6
Patches/LineageOS-20.0/android_packages_apps_Updater/0002-Tor_Support.patch
View File

@ -376,10 +376,10 @@ index 774d1be..8a01e3d 100644
android:id="@+id/preferences_auto_delete_updates" android:id="@+id/preferences_auto_delete_updates"
android:layout_width="match_parent" android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c64dca..6b78e39 100644 index 0303481..46bb291 100644
--- a/app/src/main/res/values/strings.xml --- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,7 @@ @@ -68,6 +68,7 @@
<string name="menu_auto_updates_check_interval_weekly">Once a week</string> <string name="menu_auto_updates_check_interval_weekly">Once a week</string>
<string name="menu_auto_updates_check_interval_monthly">Once a month</string> <string name="menu_auto_updates_check_interval_monthly">Once a month</string>
<string name="menu_auto_updates_check_interval_never">Never</string> <string name="menu_auto_updates_check_interval_never">Never</string>
@ -387,7 +387,7 @@ index 8c64dca..6b78e39 100644
<string name="menu_auto_delete_updates">Delete updates when installed</string> <string name="menu_auto_delete_updates">Delete updates when installed</string>
<string name="menu_delete_update">Delete</string> <string name="menu_delete_update">Delete</string>
<string name="menu_copy_url">Copy URL</string> <string name="menu_copy_url">Copy URL</string>
@@ -76,6 +77,7 @@ @@ -85,6 +86,7 @@
<string name="snack_download_failed">The download failed. Please check your internet connection and try again later.</string> <string name="snack_download_failed">The download failed. Please check your internet connection and try again later.</string>
<string name="snack_download_verification_failed">The update verification failed.</string> <string name="snack_download_verification_failed">The update verification failed.</string>
<string name="snack_download_verified">Download completed.</string> <string name="snack_download_verified">Download completed.</string>

4
Patches/LineageOS-20.0/android_packages_apps_Updater/0003-Server_Choices.patch
View File

@ -176,10 +176,10 @@ index cc90a3f..2940af9 100644
+ </string-array> + </string-array>
</resources> </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6b78e39..0bec867 100644 index 46bb291..d1e634f 100644
--- a/app/src/main/res/values/strings.xml --- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,11 @@ @@ -68,6 +68,11 @@
<string name="menu_auto_updates_check_interval_weekly">Once a week</string> <string name="menu_auto_updates_check_interval_weekly">Once a week</string>
<string name="menu_auto_updates_check_interval_monthly">Once a month</string> <string name="menu_auto_updates_check_interval_monthly">Once a month</string>
<string name="menu_auto_updates_check_interval_never">Never</string> <string name="menu_auto_updates_check_interval_never">Never</string>

2
Scripts/Common/Fix_CVE_Patchers.sh
View File

@ -136,7 +136,7 @@ done
declare -a threeDotEighteen=("${threeDotTen[@]}" "android_kernel_samsung_universal8890.sh" "android_kernel_google_dragon.sh" "android_kernel_zte_msm8996.sh" "android_kernel_asus_msm8953.sh" "android_kernel_google_marlin.sh" "android_kernel_motorola_msm8996.sh" "android_kernel_oneplus_msm8996.sh"); declare -a threeDotEighteen=("${threeDotTen[@]}" "android_kernel_samsung_universal8890.sh" "android_kernel_google_dragon.sh" "android_kernel_zte_msm8996.sh" "android_kernel_asus_msm8953.sh" "android_kernel_google_marlin.sh" "android_kernel_motorola_msm8996.sh" "android_kernel_oneplus_msm8996.sh");
for script in "${threeDotEighteen[@]}" for script in "${threeDotEighteen[@]}"
do do
commentPatches $script "0008-Graphene-Kernel_Hardening-slub/4.4/0002.patch" "CVE-2018-16597/4.4" "CVE-2019-19319/4.4" "CVE-2020-0305/4.4" "CVE-2020-0429/4.4" "CVE-2020-8992/4.4" "CVE-2021-1048/4.4" "CVE-2021-3428/4.4" "CVE-2021-20265/4.4" "CVE-2021-47320" "CVE-2022-1184/4.4/0014.patch" "CVE-2022-1184/4.9/0007.patch" "CVE-2022-40768/4.9/0007.patch" "CVE-2022-40768/4.4/0008.patch" "CVE-2022-47929/4.4" "CVE-2023-0458" "CVE-2024-26889"; commentPatches $script "0008-Graphene-Kernel_Hardening-slub/4.4/0002.patch" "CVE-2018-16597/4.4" "CVE-2019-19319/4.4" "CVE-2020-0305/4.4" "CVE-2020-0429/4.4" "CVE-2020-8992/4.4" "CVE-2021-1048/4.4" "CVE-2021-3428/4.4" "CVE-2021-20265/4.4" "CVE-2021-47277" "CVE-2021-47320" "CVE-2022-1184/4.4/0014.patch" "CVE-2022-1184/4.9/0007.patch" "CVE-2022-40768/4.9/0007.patch" "CVE-2022-40768/4.4/0008.patch" "CVE-2022-47929/4.4" "CVE-2023-0458" "CVE-2024-26889";
done done
#4.4 #4.4

2
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
View File

@ -538,7 +538,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
View File

@ -624,7 +624,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8952.sh
View File

@ -469,7 +469,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
View File

@ -733,7 +733,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch

2
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
View File

@ -632,7 +632,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh
View File

@ -417,7 +417,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
View File

@ -693,7 +693,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch

2
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh
View File

@ -428,7 +428,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh
View File

@ -553,7 +553,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh
View File

@ -561,7 +561,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
View File

@ -673,7 +673,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch

2
Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
View File

@ -414,7 +414,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh
View File

@ -477,7 +477,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh
View File

@ -281,7 +281,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh
View File

@ -414,7 +414,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
View File

@ -467,7 +467,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
View File

@ -396,7 +396,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh
View File

@ -398,7 +398,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh
View File

@ -487,7 +487,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch

2
Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh
View File

@ -312,7 +312,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
View File

@ -504,7 +504,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch

2
Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
View File

@ -448,7 +448,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/^5.13/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47294/4.4/0004.patch

2
Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
View File

@ -489,7 +489,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47266/^5.13/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47267/4.9/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47269/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47276/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47277/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47284/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47285/3.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47288/4.4/0004.patch