mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-09-21 16:56:08 +00:00
082bc48c32
https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
57 lines
2.7 KiB
Diff
57 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alisher Alikhodjaev <alisher@google.com>
|
|
Date: Fri, 18 Mar 2022 17:13:05 -0700
|
|
Subject: [PATCH] OOB read in phNciNfc_RecvMfResp()
|
|
|
|
The size of RspBuff for Mifare shall be at least 2 bytes:
|
|
Mifare Req/Rsp Id + Status
|
|
|
|
Bug: 221852424
|
|
Test: build ok
|
|
Change-Id: I3a1e10997de8d2a7cb8bbb524fc8788aaf97944e
|
|
(cherry picked from commit f0d86f7fe23499cd4c6631348618463fbc496436)
|
|
Merged-In: I3a1e10997de8d2a7cb8bbb524fc8788aaf97944e
|
|
---
|
|
.../pn54x/src/mifare/phNxpExtns_MifareStd.cpp | 14 +++-----------
|
|
1 file changed, 3 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
|
|
index bc87ae40..f5b94225 100644
|
|
--- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
|
|
+++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
|
|
@@ -1122,8 +1122,9 @@ static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo,
|
|
if (NULL == RspBuffInfo) {
|
|
status = NFCSTATUS_FAILED;
|
|
} else {
|
|
- if ((0 == (RspBuffInfo->wLen)) || (PH_NCINFC_STATUS_OK != wStatus) ||
|
|
- (NULL == (RspBuffInfo->pBuff))) {
|
|
+ if (((PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE) >
|
|
+ RspBuffInfo->wLen) ||
|
|
+ (PH_NCINFC_STATUS_OK != wStatus) || (NULL == (RspBuffInfo->pBuff))) {
|
|
status = NFCSTATUS_FAILED;
|
|
} else {
|
|
RecvdExtnRspId = (phNciNfc_ExtnRespId_t)RspBuffInfo->pBuff[0];
|
|
@@ -1137,10 +1138,6 @@ static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo,
|
|
NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WRITE ||
|
|
NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN ||
|
|
NdefMap->State == PH_FRINFC_NDEFMAP_STATE_INIT)) {
|
|
- if (2 > RspBuffInfo->wLen) {
|
|
- android_errorWriteLog(0x534e4554, "181346550");
|
|
- return NFCSTATUS_FAILED;
|
|
- }
|
|
uint8_t rspAck = RspBuffInfo->pBuff[RspBuffInfo->wLen - 2];
|
|
uint8_t rspAckMask = ((RspBuffInfo->pBuff[RspBuffInfo->wLen - 1]) &
|
|
MAX_NUM_VALID_BITS_FOR_ACK);
|
|
@@ -1154,11 +1151,6 @@ static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo,
|
|
status = NFCSTATUS_SUCCESS;
|
|
uint16_t wRecvDataSz = 0;
|
|
|
|
- if ((PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE) >
|
|
- RspBuffInfo->wLen) {
|
|
- android_errorWriteLog(0x534e4554, "181346550");
|
|
- return NFCSTATUS_FAILED;
|
|
- }
|
|
/* DataLen = TotalRecvdLen - (sizeof(RspId) + sizeof(Status)) */
|
|
wPldDataSize = ((RspBuffInfo->wLen) -
|
|
(PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE));
|