Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

6 months worth of security patches! #1

Open
wants to merge 2 commits into
base: 12-pn5xx
Choose a base branch
from
Open

6 months worth of security patches! #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5fa3d1
OOBW in nci_snd_set_routing_cmd()
Feb 1, 2023
253b9bd
OOBR in NxpMfcReader::SendIncDecRestoreCmdPart2
Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions halimpl/mifare/NxpMfcReader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ int NxpMfcReader::Write(uint16_t mfcDataLen, const uint8_t *pMfcData) {
BuildMfcCmd(&mfcTagCmdBuff[3], &mfcTagCmdBuffLen);

mfcTagCmdBuff[2] = mfcTagCmdBuffLen;
mfcDataLen = mfcTagCmdBuffLen + NCI_HEADER_SIZE;
int writtenDataLen = phNxpNciHal_write_internal(mfcDataLen, mfcTagCmdBuff);
int writtenDataLen = phNxpNciHal_write_internal(
mfcTagCmdBuffLen + NCI_HEADER_SIZE, mfcTagCmdBuff);

/* send TAG_CMD part 2 for Mifare increment ,decrement and restore commands */
if (mfcTagCmdBuff[4] == eMifareDec || mfcTagCmdBuff[4] == eMifareInc ||
mfcTagCmdBuff[4] == eMifareRestore) {
SendIncDecRestoreCmdPart2(pMfcData);
SendIncDecRestoreCmdPart2(mfcDataLen, pMfcData);
}
return writtenDataLen;
}
Expand Down Expand Up @@ -264,14 +264,19 @@ void NxpMfcReader::AuthForWrite() {
** Returns None
**
*******************************************************************************/
void NxpMfcReader::SendIncDecRestoreCmdPart2(const uint8_t *mfcData) {
void NxpMfcReader::SendIncDecRestoreCmdPart2(uint16_t mfcDataLen,
const uint8_t *mfcData) {
NFCSTATUS status = NFCSTATUS_SUCCESS;
/* Build TAG_CMD part 2 for Mifare increment ,decrement and restore commands*/
uint8_t incDecRestorePart2[] = {0x00, 0x00, 0x05, (uint8_t)eMfRawDataXchgHdr,
0x00, 0x00, 0x00, 0x00};
uint8_t incDecRestorePart2Size =
(sizeof(incDecRestorePart2) / sizeof(incDecRestorePart2[0]));
if (mfcData[3] == eMifareInc || mfcData[3] == eMifareDec) {
if (incDecRestorePart2Size >= mfcDataLen) {
incDecRestorePart2Size = mfcDataLen - 1;
android_errorWriteLog(0x534e4554, "238177877");
}
for (int i = 4; i < incDecRestorePart2Size; i++) {
incDecRestorePart2[i] = mfcData[i + 1];
}
Expand Down
4 changes: 2 additions & 2 deletions halimpl/mifare/NxpMfcReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ class NxpMfcReader {
void BuildIncDecCmd();
void CalcSectorAddress();
void AuthForWrite();
void SendIncDecRestoreCmdPart2(const uint8_t *mfcData);
void SendIncDecRestoreCmdPart2(uint16_t mfcDataLen, const uint8_t *mfcData);

public:
int Write(uint16_t mfcDataLen, const uint8_t *pMfcData);
NFCSTATUS AnalyzeMfcResp(uint8_t *pBuff, uint16_t *pBufflen);
NFCSTATUS CheckMfcResponse(uint8_t *pTransceiveData,
uint16_t transceiveDataLen);
static NxpMfcReader &getInstance();
};
};
4 changes: 4 additions & 0 deletions halimpl/src/halLibnfc/src/nfc/nci/nci_hmsgs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down