From 5f6eee66ff561845b3c8841021d5f4cd70f2e0d0 Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Fri, 16 Feb 2018 15:04:02 +0000 Subject: [PATCH] Correctly check against minumum RX frame length --- arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c b/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c index cf1676570..3be828722 100644 --- a/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c +++ b/arch/cpu/cc26xx-cc13xx/rf-core/ieee-mode.c @@ -1079,17 +1079,17 @@ read_frame(void *buf, unsigned short buf_len) return 0; } - if(rx_read_entry[8] < 4) { - PRINTF("RF: too short\n"); + len = rx_read_entry[8] - 8; + + if(len > buf_len) { + PRINTF("RF: too long\n"); release_data_entry(); return 0; } - len = rx_read_entry[8] - 8; - - if(len > buf_len) { - PRINTF("RF: too long\n"); + if(len < 5) { + PRINTF("RF: too short\n"); release_data_entry(); return 0;