mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-05 19:11:15 +00:00
59bf3b75c7
https://review.lineageos.org/c/LineageOS/android_frameworks_base/+/353117 https://review.lineageos.org/q/topic:Q_asb_2023-03 https://review.lineageos.org/q/topic:Q_asb_2023-04 https://review.lineageos.org/q/topic:Q_asb_2023-05 https://review.lineageos.org/q/topic:Q_asb_2023-06 https://review.lineageos.org/q/topic:Q_asb_2023-07 https://review.lineageos.org/q/topic:Q_asb_2023-08 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376560 https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376561 https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376562 https://review.lineageos.org/q/topic:Q_asb_2023-09 https://review.lineageos.org/q/topic:Q_asb_2023-10 https://review.lineageos.org/q/topic:Q_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/376563 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_webp/+/376568 https://review.lineageos.org/q/topic:Q_asb_2023-12 https://review.lineageos.org/q/topic:Q_asb_2024-01 https://review.lineageos.org/q/topic:Q_asb_2024-02 https://review.lineageos.org/q/topic:Q_asb_2024-03 Signed-off-by: Tavi <tavi@divested.dev>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alisher Alikhodjaev <alisher@google.com>
|
|
Date: Tue, 31 Jan 2023 19:04:09 -0800
|
|
Subject: [PATCH] OOBW in nci_snd_set_routing_cmd()
|
|
|
|
Bug: 264879662
|
|
Test: read a tag, nfc on/off
|
|
Change-Id: I408cf611fb35e9467d7484165ce48759970b158a
|
|
(cherry picked from commit 1dd4d2e1b481dd83ca2b222993fdb74ae5306c78)
|
|
Merged-In: I408cf611fb35e9467d7484165ce48759970b158a
|
|
---
|
|
halimpl/src/halLibnfc/src/nfc/nci/nci_hmsgs.cc | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/halimpl/src/halLibnfc/src/nfc/nci/nci_hmsgs.cc b/halimpl/src/halLibnfc/src/nfc/nci/nci_hmsgs.cc
|
|
index a76ba5a..34d1d07 100755
|
|
--- a/halimpl/src/halLibnfc/src/nfc/nci/nci_hmsgs.cc
|
|
+++ b/halimpl/src/halLibnfc/src/nfc/nci/nci_hmsgs.cc
|
|
@@ -672,6 +672,10 @@ uint8_t nci_snd_set_routing_cmd(bool more, uint8_t num_tlv, uint8_t tlv_size,
|
|
uint8_t *pp;
|
|
uint8_t size = tlv_size + 2;
|
|
|
|
+ if (size < tlv_size) {
|
|
+ return (NCI_STATUS_FAILED);
|
|
+ }
|
|
+
|
|
if (tlv_size == 0) {
|
|
/* just to terminate routing table
|
|
* 2 bytes (more=false and num routing entries=0) */
|