diff --git a/net/core/filter.c b/net/core/filter.c
index 4594ad6e6694..aee29ec98244 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2968,8 +2968,8 @@ BPF_CALL_4(bpf_msg_pop_data, struct sk_msg *, msg, u32, start,
 	   u32, len, u64, flags)
 {
 	u32 i = 0, l = 0, space, offset = 0;
-	u64 last = start + len;
-	int pop;
+	u64 last = (u64)start + len;
+	u32 pop;
 
 	if (unlikely(flags))
 		return -EINVAL;