netdev - Re: [PATCH v4 net] ps3/gelic: Fix SKB allocation

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <125361c7ec88478e04595a53aacc406ef656f136.camel@redhat.com>
Date: Tue, 13 Feb 2024 13:07:14 +0100
From: Paolo Abeni <pabeni@...hat.com>
To: Geoff Levand <geoff@...radead.org>, sambat goson <sombat3960@...il.com>,
  Christophe Leroy <christophe.leroy@...roup.eu>, "David S. Miller"
 <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH v4 net] ps3/gelic: Fix SKB allocation

On Sat, 2024-02-10 at 17:15 +0900, Geoff Levand wrote:
> Commit 3ce4f9c3fbb3 ("net/ps3_gelic_net: Add gelic_descr structures") of
> 6.8-rc1 did not allocate a network SKB for the gelic_descr, resulting in a
> kernel panic when the SKB variable (struct gelic_descr.skb) was accessed.
> 
> This fix changes the way the napi buffer and corresponding SKB are
> allocated and managed.

I think this is not what Jakub asked on v3.

Isn't something alike the following enough to fix the NULL ptr deref?

Thanks,

Paolo
---
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
index d5b75af163d3..51ee6075653f 100644
--- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c
+++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
@@ -395,7 +395,6 @@ static int gelic_descr_prepare_rx(struct gelic_card *card,
        descr->hw_regs.data_error = 0;
        descr->hw_regs.payload.dev_addr = 0;
        descr->hw_regs.payload.size = 0;
-       descr->skb = NULL;

        offset = ((unsigned long)descr->skb->data) &
                (GELIC_NET_RXBUF_ALIGN - 1);