diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2019-06-29 21:51:16 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2019-06-29 21:58:56 +0200 |
| commit | bea5ccb05c9c161e0e57de0b6ec51858ae53653b (patch) | |
| tree | 98b921949fc1eb6456de6a9cd2b276cc57a1a3a5 /print-802_15_4.c | |
| parent | 5ecde31cb3055ce2dd3161abb098d77315febd2f (diff) | |
| download | tcpdump-bea5ccb05c9c161e0e57de0b6ec51858ae53653b.tar.gz | |
IEEE 802.15.4: Use GET_LE64ADDR_STRING() macro to add bounds checks.
This fixes a buffer over-read discovered by Shadow HUANG.
Diffstat (limited to 'print-802_15_4.c')
| -rw-r--r-- | print-802_15_4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/print-802_15_4.c b/print-802_15_4.c index 37f111bc..7e78e4a5 100644 --- a/print-802_15_4.c +++ b/print-802_15_4.c @@ -543,7 +543,7 @@ ieee802_15_4_print_addr(netdissect_options *ndo, const u_char *p, ND_PRINT("%04x", GET_LE_U_2(p)); break; case 8: - ND_PRINT("%s", le64addr_string(ndo, p)); + ND_PRINT("%s", GET_LE64ADDR_STRING(p)); break; } return; @@ -1575,7 +1575,7 @@ ieee802_15_4_print_aux_sec_header(netdissect_options *ndo, return -1; } if (ndo->ndo_vflag > 1) { - ND_PRINT("KeySource %s, ", le64addr_string(ndo, p)); + ND_PRINT("KeySource %s, ", GET_LE64ADDR_STRING(p)); } p += 4; caplen -= 4; |