1 files changed, 5 insertions, 2 deletions

diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index cc94d921476c..93bffaad2135 100644
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -411,6 +411,7 @@ static int sk_psock_skb_ingress(struct sk_psock *psock, struct sk_buff *skb)
         sk_mem_charge(sk, skb->len);
         copied = skb->len;
         msg->sg.start = 0;
+        msg->sg.size = copied;
         msg->sg.end = num_sge == MAX_MSG_FRAGS ? 0 : num_sge;
         msg->skb = skb;
 
@@ -554,8 +555,10 @@ static void sk_psock_destroy_deferred(struct work_struct *gc)
         struct sk_psock *psock = container_of(gc, struct sk_psock, gc);
 
         /* No sk_callback_lock since already detached. */
-        strp_stop(&psock->parser.strp);
-        strp_done(&psock->parser.strp);
+
+        /* Parser has been stopped */
+        if (psock->progs.skb_parser)
+                strp_done(&psock->parser.strp);
 
         cancel_work_sync(&psock->work);