| Message ID | 20240906102839.202798-1-usama.anjum@collabora.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4c8002277167125078e6b9b90137bdf443ebaa08 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | fou: fix initialization of grc | expand |
From: Muhammad Usama Anjum <usama.anjum@collabora.com> Date: Fri, 6 Sep 2024 15:28:39 +0500 > 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> Thanks! > --- > net/ipv4/fou_core.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/ipv4/fou_core.c b/net/ipv4/fou_core.c > index 78b869b314921..3e30745e2c09a 100644 > --- a/net/ipv4/fou_core.c > +++ b/net/ipv4/fou_core.c > @@ -336,11 +336,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); > > -- > 2.39.2
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 6 Sep 2024 15:28:39 +0500 you wrote: > 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> > > [...] Here is the summary with links: - fou: fix initialization of grc https://git.kernel.org/netdev/net/c/4c8002277167 You are awesome, thank you!
diff --git a/net/ipv4/fou_core.c b/net/ipv4/fou_core.c index 78b869b314921..3e30745e2c09a 100644 --- a/net/ipv4/fou_core.c +++ b/net/ipv4/fou_core.c @@ -336,11 +336,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);
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> --- net/ipv4/fou_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)