1 files changed, 7 insertions, 3 deletions

diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
index f14e54a05691..022d18ab27a6 100644
--- a/net/batman-adv/fragmentation.c
+++ b/net/batman-adv/fragmentation.c
@@ -128,6 +128,7 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node,
 {
         struct batadv_frag_table_entry *chain;
         struct batadv_frag_list_entry *frag_entry_new = NULL, *frag_entry_curr;
+        struct batadv_frag_list_entry *frag_entry_last = NULL;
         struct batadv_frag_packet *frag_packet;
         uint8_t bucket;
         uint16_t seqno, hdr_size = sizeof(struct batadv_frag_packet);
@@ -180,11 +181,14 @@ static bool batadv_frag_insert_packet(struct batadv_orig_node *orig_node,
                         ret = true;
                         goto out;
                 }
+
+                /* store current entry because it could be the last in list */
+                frag_entry_last = frag_entry_curr;
         }
 
-        /* Reached the end of the list, so insert after 'frag_entry_curr'. */
-        if (likely(frag_entry_curr)) {
-                hlist_add_after(&frag_entry_curr->list, &frag_entry_new->list);
+        /* Reached the end of the list, so insert after 'frag_entry_last'. */
+        if (likely(frag_entry_last)) {
+                hlist_add_after(&frag_entry_last->list, &frag_entry_new->list);
                 chain->size += skb->len - hdr_size;
                 chain->timestamp = jiffies;
                 ret = true;