michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples: zperf: fix an unaligned access in the UDP uploader

Browse source 
zperf takes a potentially unaligned netowrk packet, casts it to a
struct, and then dereferences the fields.  This causes a crash on
cores that don't support unaligned access such as the Cortex-M0+.

Use the UNALIGNED_GET helper instead.

Signed-off-by: Michael Hope <mlhx@google.com>
This commit is contained in:
Michael Hope 2020-06-08 20:34:49 +02:00 • committed by Jukka Rissanen
commit 69b76d7305
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
samples/net/zperf/src/zperf_udp_uploader.c
View file

@ -49,14 +49,15 @@ static inline void zperf_upload_decode_stat(const struct shell *shell,
return; return;
} }
results->nb_packets_rcvd = ntohl(stat->datagrams); results->nb_packets_rcvd = ntohl(UNALIGNED_GET(&stat->datagrams));
results->nb_packets_lost = ntohl(stat->error_cnt); results->nb_packets_lost = ntohl(UNALIGNED_GET(&stat->error_cnt));
results->nb_packets_outorder = ntohl(stat->outorder_cnt); results->nb_packets_outorder =
results->nb_bytes_sent = ntohl(stat->total_len2); ntohl(UNALIGNED_GET(&stat->outorder_cnt));
results->time_in_us = ntohl(stat->stop_usec) + results->nb_bytes_sent = ntohl(UNALIGNED_GET(&stat->total_len2));
ntohl(stat->stop_sec) * USEC_PER_SEC; results->time_in_us = ntohl(UNALIGNED_GET(&stat->stop_usec)) +
results->jitter_in_us = ntohl(stat->jitter2) + ntohl(UNALIGNED_GET(&stat->stop_sec)) * USEC_PER_SEC;
ntohl(stat->jitter1) * USEC_PER_SEC; results->jitter_in_us = ntohl(UNALIGNED_GET(&stat->jitter2)) +
ntohl(UNALIGNED_GET(&stat->jitter1)) * USEC_PER_SEC;
} }
static void stat_received(struct net_context *context, static void stat_received(struct net_context *context,