From d320100df4bc59784e9bae8bc1bbc7db64a32bc6 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 29 Dec 2022 14:04:33 +0200 Subject: [PATCH] net: ip: Fix dereference before NULL check Fix warnings like "Dereference before NULL check". Also make check readable. Signed-off-by: Andrei Emeltchenko --- subsys/net/ip/net_pkt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c index 81bba652542..f981bc9cfbd 100644 --- a/subsys/net/ip/net_pkt.c +++ b/subsys/net/ip/net_pkt.c @@ -1775,15 +1775,17 @@ int net_pkt_copy(struct net_pkt *pkt_dst, static int32_t net_pkt_find_offset(struct net_pkt *pkt, uint8_t *ptr) { - struct net_buf *buf = pkt->buffer; + struct net_buf *buf; uint32_t ret = -EINVAL; uint16_t offset; - if (!(ptr && pkt && buf)) { + if (!ptr || !pkt || !pkt->buffer) { return ret; } offset = 0U; + buf = pkt->buffer; + while (buf) { if (buf->data <= ptr && ptr <= (buf->data + buf->len)) { ret = offset + (ptr - buf->data);