diff --git a/net/ipv4/tcp_comp.c b/net/ipv4/tcp_comp.c
index f6ebe52f3f7f77c25b2914b1dc0b5c7789651b7f..bd5274091225b2e1933e529de110529b2372aa6f 100644
--- a/net/ipv4/tcp_comp.c
+++ b/net/ipv4/tcp_comp.c
@@ -789,7 +789,7 @@ static int comp_read_size(struct strparser *strp, struct sk_buff *skb)
 	if (rxm->offset > skb->len)
 		return 0;
 
-	return skb->len;
+	return skb->len - rxm->offset;
 }
 
 void comp_setup_strp(struct sock *sk, struct tcp_comp_context *ctx)
@@ -903,6 +903,7 @@ static void tcp_comp_context_free(struct rcu_head *head)
 
 	tcp_comp_context_tx_free(ctx);
 	tcp_comp_context_rx_free(ctx);
+	strp_done(&ctx->rx.strp);
 	kfree(ctx);
 }
 
@@ -923,6 +924,7 @@ void tcp_cleanup_compression(struct sock *sk)
 		kfree_skb(ctx->rx.pkt);
 		ctx->rx.pkt = NULL;
 	}
+	strp_stop(&ctx->rx.strp);
 
 	rcu_assign_pointer(icsk->icsk_ulp_data, NULL);
 	call_rcu(&ctx->rcu, tcp_comp_context_free);