diff options
| author | fang.x.chen <fang.x.chen@sonymobile.com> | 2016-11-07 12:31:10 +0900 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2017-01-20 13:45:20 -0800 |
| commit | 3e3d4cec3e5c2e786261407f1a44e9d87ece60bb (patch) | |
| tree | f5a303179ae8187a2a9283740cb160524e112ab2 | |
| parent | 0e3eeae5ec8d7ea910407b81e2ba52abc9b84257 (diff) | |
| download | libnfc-nci-nougat-mr1-volantis-release.tar.gz | |
Fix native crash in nfc_ncif_proc_activateandroid-7.1.1_r58android-7.1.1_r54android-7.1.1_r53android-7.1.1_r51android-7.1.1_r49android-7.1.1_r47android-7.1.1_r46android-7.1.1_r44android-7.1.1_r43android-7.1.1_r41android-7.1.1_r39android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r24nougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-flounder-release
The destination of memcpy is allocated with a predetermined maximum
length, but in some cases the length of information being copied is
greater than the maximum length of the destination.
This is the root cause of crash.
Add length check before memcpy to avoid memory overflow
Test: Repeat reading and writing tag
Bug: 33434992
Bug: 32688507
Change-Id: I09ee3c734e9be38a35b1d48679d74e42e0432d78
(cherry picked from commit 09cb3b3dc46c8bab51346a4163b130857d806418)
| -rw-r--r-- | src/nfc/nfc/nfc_ncif.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nfc/nfc/nfc_ncif.c b/src/nfc/nfc/nfc_ncif.c index 99ad256..2e2c14f 100644 --- a/src/nfc/nfc/nfc_ncif.c +++ b/src/nfc/nfc/nfc_ncif.c @@ -839,6 +839,8 @@ void nfc_ncif_proc_activate (UINT8 *p, UINT8 len) pp++; /* TC */ } p_pa_iso->his_byte_len = (UINT8) (p_pa_iso->ats_res_len - (pp - p_pa_iso->ats_res)); + if (p_pa_iso->his_byte_len > NFC_MAX_HIS_BYTES_LEN) + p_pa_iso->his_byte_len = NFC_MAX_HIS_BYTES_LEN; memcpy (p_pa_iso->his_byte, pp, p_pa_iso->his_byte_len); break; |