Merge tag 'android-13.0.0_r38' into int/13/fp3
Android 13.0.0 Release 38 (TQ2A.230405.003)
* tag 'android-13.0.0_r38':
OOBW in nci_snd_set_routing_cmd()
Change-Id: Ic2c38c7af7bba632eb308067ac5a677304f24767
diff --git a/src/nfc/nci/nci_hmsgs.cc b/src/nfc/nci/nci_hmsgs.cc
index ed7caaa..81497c8 100644
--- a/src/nfc/nci/nci_hmsgs.cc
+++ b/src/nfc/nci/nci_hmsgs.cc
@@ -632,6 +632,10 @@
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) */