Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-07-10 16:38:04 -04:00
parent f699e1bc86
commit 7a53edc390
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
7 changed files with 10 additions and 18 deletions

View File

@ -11,10 +11,10 @@ Subject: [PATCH] perform additional boot-time checks on system package updates
create mode 100644 services/core/java/com/android/server/pm/PackageVerityExt.java
diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index c32a57c68ede..d037e28f74fd 100644
index 259701166147..6044961e8639 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -3808,6 +3808,13 @@ final class InstallPackageHelper {
@@ -3824,6 +3824,13 @@ final class InstallPackageHelper {
@Nullable UserHandle user) throws PackageManagerException {
final boolean scanSystemPartition =
(parseFlags & ParsingPackageUtils.PARSE_IS_SYSTEM_DIR) != 0;

View File

@ -63,7 +63,7 @@ index e988679fac..b7f4692198 100644
/**
* Set the MAC randomization setting for this network.
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index ee6fea7ac8..5a6ab45179 100644
index dca3e6b139..9c45521fde 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -467,6 +467,9 @@ public class WifiConfigManager {
@ -87,7 +87,7 @@ index ee6fea7ac8..5a6ab45179 100644
return config.getRandomizedMacAddress();
}
diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
index 907ca721dd..d1c489f4b2 100644
index 4a594b7a2a..9e8b660374 100644
--- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java
+++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
@@ -245,7 +245,7 @@ public class WifiConfigurationUtil {

View File

@ -19,10 +19,10 @@ Signed-off-by: penglezos <panagiotisegl@gmail.com>
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index bd87041319..29855575e1 100644
index 9ea75285d8..0ba938dcd7 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -345,6 +345,8 @@ public class ClientModeImpl extends StateMachine implements ClientMode {
@@ -344,6 +344,8 @@ public class ClientModeImpl extends StateMachine implements ClientMode {
private DetailedState mNetworkAgentState;
private final SupplicantStateTracker mSupplicantStateTracker;

View File

@ -61,7 +61,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39189/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/5.10/0004.patch
@ -108,7 +107,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3220/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3268/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3358/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3389/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21255/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
@ -132,7 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35826/^6.3/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35828/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35829/5.10/0002.patch
editKernelLocalversion "-dos.p132"
editKernelLocalversion "-dos.p130"
else echo "kernel_google_gs101_private_gs-google is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

View File

@ -61,7 +61,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39189/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/5.10/0004.patch
@ -108,7 +107,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3220/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3268/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3358/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3389/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21255/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
@ -132,7 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35826/^6.3/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35828/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35829/5.10/0002.patch
editKernelLocalversion "-dos.p132"
editKernelLocalversion "-dos.p130"
else echo "kernel_google_gs201_private_gs-google is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

View File

@ -106,20 +106,18 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3161/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3358/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21657/4.14/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22387/ANY/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28541/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/4.14/0003.patch
editKernelLocalversion "-dos.p119"
editKernelLocalversion "-dos.p117"
else echo "kernel_google_msm-4.14 is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

View File

@ -79,7 +79,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch
@ -118,7 +117,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3220/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3358/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21656/4.19/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22386/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22387/ANY/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/4.19/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.19/0003.patch
@ -136,7 +134,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35788/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35823/4.19/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/4.19/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35828/4.19/0002.patch
editKernelLocalversion "-dos.p136"
editKernelLocalversion "-dos.p134"
else echo "kernel_google_redbull is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"