2023-04-12 20:37:43 -04:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2023-04-12 15:30:57 -04:00
|
|
|
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
|
|
|
|
|
---
|
|
|
|
|
src/nfc/nci/nci_hmsgs.c | 5 +++++
|
|
|
|
|
1 file changed, 5 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/nfc/nci/nci_hmsgs.c b/src/nfc/nci/nci_hmsgs.c
|
|
|
|
|
index af6ad5d..d7a96b4 100644
|
|
|
|
|
--- a/src/nfc/nci/nci_hmsgs.c
|
|
|
|
|
+++ b/src/nfc/nci/nci_hmsgs.c
|
|
|
|
|
@@ -588,6 +588,11 @@ UINT8 nci_snd_set_routing_cmd (BOOLEAN more, UINT8 num_tlv, UINT8 tlv_size, UINT
|
|
|
|
|
UINT8 *pp;
|
|
|
|
|
UINT8 size = tlv_size + 2;
|
|
|
|
|
|
|
|
|
|
+ if (size < tlv_size)
|
|
|
|
|
+ {
|
|
|
|
|
+ return (NCI_STATUS_FAILED);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
if (tlv_size == 0)
|
|
|
|
|
{
|
|
|
|
|
/* just to terminate routing table
|
