ASB - February 2024 Security Patches integration

Integrating Security Patches Test done: STS r23 TCs Passed Tracked-On: OAM-115406 Signed-off-by: Alam, SahibeX <[email protected]>
projectceladon · Jan 29, 2024 · 6a8e5a4 · 6a8e5a4
1 parent 280d346
commit 6a8e5a4
Show file tree

Hide file tree

Showing 13 changed files with 582,498 additions and 1 deletion.
diff --git a/aosp_diff/preliminary/build/make/04_0004-Update-security_patch_level-string.patch b/aosp_diff/preliminary/build/make/04_0004-Update-security_patch_level-string.patch
@@ -20,7 +20,7 @@ index 47bb92c142..2d0ac256a4 100644
      #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
      #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
 -      PLATFORM_SECURITY_PATCH := 2022-02-05
-+      PLATFORM_SECURITY_PATCH := 2024-01-01
++      PLATFORM_SECURITY_PATCH := 2024-02-01
  endif
  .KATI_READONLY := PLATFORM_SECURITY_PATCH
 

diff --git a/aosp_diff/preliminary/cts/0001-Change-open-jpeg-folder-name.bulletin.patch b/aosp_diff/preliminary/cts/0001-Change-open-jpeg-folder-name.bulletin.patch
@@ -0,0 +1,35 @@
+From 439eeb3b8723f9c06c4d0caeb9f86c97d712cbae Mon Sep 17 00:00:00 2001
+From: kumarashishg <[email protected]>
+Date: Wed, 28 Jun 2023 07:15:27 +0000
+Subject: [PATCH] Change open jpeg folder name
+
+Replace libopenjpeg20 to libopenjpeg as folder name got updated in the
+pdfium library
+
+Bug: 279055389
+Test: Build the code and flash the device and check Print functionality
+(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75bd8508b7040f33aed77945d5dfe2dfed4a071c)
+Merged-In: I5b3d5740128f6ecc23dd8f9446a4f40c8550fd88
+Change-Id: I5b3d5740128f6ecc23dd8f9446a4f40c8550fd88
+---
+ .../securitybulletin/securityPatch/CVE-2016-8332/Android.bp    | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp
+index 382d629cdb3..aa676df02d2 100644
+--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp
++++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332/Android.bp
+@@ -30,8 +30,9 @@ cc_test {
+     ],
+     static_libs: [
+         "libpdfium-libopenjpeg2",
++        "libpdfium-fxcrt",
+     ],
+     include_dirs: [
+-        "external/pdfium/third_party/libopenjpeg20",
++        "external/pdfium/third_party/libopenjpeg",
+     ],
+ }
+-- 
+2.43.0.195.gebba966016-goog
+
diff --git a/...iminary/external/pdfium/0001-Update-pdfium-to-Chrome-114-0-5735-130-pdfium.bulletin.patch b/...iminary/external/pdfium/0001-Update-pdfium-to-Chrome-114-0-5735-130-pdfium.bulletin.patch
diff --git a/aosp_diff/preliminary/frameworks/av/34_0034-Update-mtp-packet-buffer.bulletin.patch b/aosp_diff/preliminary/frameworks/av/34_0034-Update-mtp-packet-buffer.bulletin.patch
@@ -0,0 +1,38 @@
+From d484868ea57c7b915622e46d31a1e4c401de6938 Mon Sep 17 00:00:00 2001
+From: Ashish Kumar Gupta <[email protected]>
+Date: Tue, 21 Nov 2023 08:48:43 +0530
+Subject: [PATCH] Update mtp packet buffer
+
+Currently, the buffer size is not changed when the packet size is increased. Ideally, the buffer size should be larger than the packet size. In our case, when the packet size is increased, we must reallocate the buffer of MTP packet.
+
+Bug: 300007708
+Test: build and flash the device. Check MTP works
+Test: run fuzzer locally
+(cherry picked from commit e1494a2d8e7eee25d7ea5469be43740e97294c99)
+(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5c0f99beb6fa5ff920caf5b0d06aaebc8e9eab24)
+(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:55757c291af9c88bf829e01fda90e626f6ff06eb)
+Merged-In: I98398a9e15962e6d5f08445ee7b17f5d61a3a528
+Change-Id: I98398a9e15962e6d5f08445ee7b17f5d61a3a528
+---
+ media/mtp/MtpPacket.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/media/mtp/MtpPacket.cpp b/media/mtp/MtpPacket.cpp
+index 5faaac2026..634aa46dd9 100644
+--- a/media/mtp/MtpPacket.cpp
++++ b/media/mtp/MtpPacket.cpp
+@@ -168,8 +168,10 @@ void MtpPacket::setParameter(int index, uint32_t value) {
+         return;
+     }
+     int offset = MTP_CONTAINER_PARAMETER_OFFSET + (index - 1) * sizeof(uint32_t);
+-    if (mPacketSize < offset + sizeof(uint32_t))
++    if (mPacketSize < offset + sizeof(uint32_t)) {
+         mPacketSize = offset + sizeof(uint32_t);
++        allocate(mPacketSize);
++    }
+     putUInt32(offset, value);
+ }
+
+-- 
+2.43.0.195.gebba966016-goog
+