From: Muhammad Usama Anjum <usama.anjum@collabora.com>
Date: Fri, 6 Sep 2024 10:28:39 +0000 (+0500)
Subject: fou: fix initialization of grc
X-Git-Tag: v5.10.227~498
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=392f6a97fcbecc64f0c00058b2db5bb0e4b8cc3e;p=thirdparty%2Fkernel%2Fstable.git

fou: fix initialization of grc

[ Upstream commit 4c8002277167125078e6b9b90137bdf443ebaa08 ]

The grc must be initialize first. There can be a condition where if
fou is NULL, goto out will be executed and grc would be used
uninitialized.

Fixes: 7e4196935069 ("fou: Fix null-ptr-deref in GRO.")
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20240906102839.202798-1-usama.anjum@collabora.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index 135da756dd5ab..1d67df4d8ed65 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -334,11 +334,11 @@ static struct sk_buff *gue_gro_receive(struct sock *sk,
 	struct gro_remcsum grc;
 	u8 proto;
 
+	skb_gro_remcsum_init(&grc);
+
 	if (!fou)
 		goto out;
 
-	skb_gro_remcsum_init(&grc);
-
 	off = skb_gro_offset(skb);
 	len = off + sizeof(*guehdr);