commit 5a5cbd9f6507fc2d0b37c4d392476228e8581b3c
author George Chang <georgekgchang@google.com> Mon Jan 28 10:17:25 2019 +0800
committer Arjun Garg <arjgarg@google.com> Tue Jul 16 15:20:27 2019 -0700
tree 6163aec5d3a117415fd791e3823f5c9a45cec532
parent 0a7432f80ec588cb0f781c06e818b71cf93a3115

Prevent OOB read in rw_t4t.cc

Bug: 120865977
Bug: 120274615
Bug: 124462242
Test: Read T4T Tag
Exempt-From-Owner-Approval: Old Owners are all transferred to another BU
Merged-In: Id1b07fa79edabaf27e18a7147d1e7ae66cf3c4b3
Change-Id: Id1b07fa79edabaf27e18a7147d1e7ae66cf3c4b3
(cherry picked from commit 38e3ecb36cb2716cc1e722305b42c2db0d0d01fc)

src/nfc/include/tags_defs.h

diff --git a/src/nfc/include/tags_defs.h b/src/nfc/include/tags_defs.h
index d7adc60..55022ff 100644
--- a/src/nfc/include/tags_defs.h
+++ b/src/nfc/include/tags_defs.h
@@ -436,6 +436,7 @@
 
 #define T4T_FILE_LENGTH_SIZE 0x02
 #define T4T_ADDI_FRAME_RESP 0xAFU
+#define T4T_DES_GET_VERSION_LEN 0x09
 #define T4T_SIZE_IDENTIFIER_2K 0x16U
 #define T4T_SIZE_IDENTIFIER_4K 0x18U
 #define T4T_SIZE_IDENTIFIER_8K 0x1AU