Skip to content

Commit f91b219

Browse files
author
Tomasz Bursztyka
committed
net/ieee802154: Avoid NULL pointer de-reference in packet reassembly
In case the very first fragment holds all the data already. Signed-off-by: Tomasz Bursztyka <[email protected]>
1 parent d303dab commit f91b219

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

subsys/net/l2/ieee802154/ieee802154_fragment.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,9 +526,11 @@ static inline enum net_verdict fragment_add_to_cache(struct net_pkt *pkt)
526526
fragment_append(cache->pkt, frag);
527527

528528
if (fragment_cached_pkt_len(cache->pkt) == cache->size) {
529-
/* Assign buffer back to input packet. */
530-
pkt->buffer = cache->pkt->buffer;
531-
cache->pkt->buffer = NULL;
529+
if (!first_frag) {
530+
/* Assign buffer back to input packet. */
531+
pkt->buffer = cache->pkt->buffer;
532+
cache->pkt->buffer = NULL;
533+
}
532534

533535
fragment_reconstruct_packet(pkt);
534536

0 commit comments

Comments
 (0)