1 files changed, 11 insertions, 4 deletions

diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index f81a3ce0fe48..a5aff2834bd6 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -566,7 +566,8 @@ nfqnl_build_packet_message(struct net *net, struct nfqnl_instance *queue,
                 goto nla_put_failure;
 
         if (indev && entskb->dev &&
-            entskb->mac_header != entskb->network_header) {
+            skb_mac_header_was_set(entskb) &&
+            skb_mac_header_len(entskb) != 0) {
                 struct nfqnl_msg_packet_hw phw;
                 int len;
 
@@ -715,9 +716,15 @@ static struct nf_queue_entry *
 nf_queue_entry_dup(struct nf_queue_entry *e)
 {
         struct nf_queue_entry *entry = kmemdup(e, e->size, GFP_ATOMIC);
-        if (entry)
-                nf_queue_entry_get_refs(entry);
-        return entry;
+
+        if (!entry)
+                return NULL;
+
+        if (nf_queue_entry_get_refs(entry))
+                return entry;
+
+        kfree(entry);
+        return NULL;
 }
 
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)