From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6AD034AB01 for ; Tue, 23 Jun 2026 02:58:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782183489; cv=none; b=irtZf4RA1xJ+1tk+IWfBkIQ1j79esMvJatm/udZPl87i8/UvpMuEReHzaE6+vpCIYtIIvPr2eDE61yMTMcV9Bc/RsL0ULrJcIn592V9qMJZqRfowT1xhR5s9bioVOgLtbC7a+m8eJEjjPwa81hecKxSnTj3ICtWp91zQXtLqyIE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782183489; c=relaxed/simple; bh=10LxfMihCDI07JP40FbER5KATJ7S8AnZMvYM5yOOyjk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=lsyd2k0nCLvv2u9AjZ3BOpOFZez6CN7nb4kfmyL3YQ5zcjx3+fKwt5JFz7+McGXGtXoyusQPIrbMZq0w6crot3pbVJ4xCCz3cIRqGzHrksRmaMpmqhVf8kewLtdg6jg2HzSLUQf5r+v/cW6/zDwtd79qkUTyf23gu8Rso+91IKk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GBlxLa6Q; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GBlxLa6Q" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2c0c1e0b0faso31756245ad.0 for ; Mon, 22 Jun 2026 19:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782183488; x=1782788288; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+n6BllR4lDnKy4Yg9p1K0cx3Xigbsi+B/pKNJ/jZbsE=; b=GBlxLa6QPx7GNPW0R5q61ecBH+1BNHhoyWqQvHFjL6Lg71rJ0UjRIKqRuhwHaamczO BnpsVWQmDsUc5r4sxfEIpVjiSODWlpscD1tgCVgTYaZ0sttT0f2C7xUUATLBfn81EecI iMhLRV03IwKw7HNnTG0qT0upKcGSm8rOzgCTUZYy6hFn2ciNVuqYxhOUbqgW2oJdto88 QAQcb0gyfA/v4s7VS/c8LSgz/ZLd+cIwzRbQUDTxN60KeaK/VxUa602wuiRZ4Hv3erNv BqSmZ2KzwnBkTaq701AN1khtvzmgV5USRigJkYLw3ya7clA31dXWCKkgeKWmNUNJsxYh HQEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782183488; x=1782788288; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+n6BllR4lDnKy4Yg9p1K0cx3Xigbsi+B/pKNJ/jZbsE=; b=UtXoxFV4Ig1it/aLMPRDieYWJUGTIGQiBfDxv7mAKfmLDzWlIuR2iVkfkYnCZkKs+6 B38K13nu24jyi8pAPpoMqLnVY5weQv2pbZlMUatjc/I2GkUW8Xkv9VXiDNDfy9fvUkh4 CA55smWlvlvkPhBCgBYjaLWRbkryrzmChmL2CSvpX0Q5gIPxeQ1Sj9f5DUoQOQnncQB4 Lm91z9eeXouJqjfgkPnaLgINEvrTTzquPdqmij/lV2ENH95LOnpRRDaGwmuCU1hq1Fzg eYucbPCp0JPnJWaWCvhaqfkZdAfr9fHk//cegpP27U7IirRKluc5k5p7TaDp5yP3K7D4 c3Gg== X-Forwarded-Encrypted: i=1; AHgh+Roh9UDNAFq4MTzvKcvVwg7ZAnYjbgwYG04ODQN5zN2GBKHq4J6t/5hJG5AEfmW77STNXt7kQx+Vym+x0Oo=@vger.kernel.org X-Gm-Message-State: AOJu0YzCkaK4neEP7Ad51ngiybOyXR+Gpw8xqfGUWyI2QP19RRyK94E5 ZR0XiDm092EDE1dF1dHVexh6IlVmtzJZ1fhLOCt9aWiPS1IOj7FoH5gY X-Gm-Gg: AfdE7cmtBbGxFdiDGdc2tFnF+sSgArvVbuSZFZA3PVqS1kBZAMwubvxL7xoMqUUtYIV jKJALesOw6LX/vYZcVOlM6Hme9P+IW8OeZVaP38e987awdjSbmEdpc22sBLAomcOpK06tJh9wiR v2zEPpR9SR9jRgc+cFqR+ACxfen2fg+Z7+vLX8YCtuXSaty9oK7A4vXnkVCrbcy3mYgHUfu1FGW /IORjBpDSu9qGWtnI29Qkkrm8t8uV/1aWa4brhi54nEz62IGQK8MZyGIPJdhpLkVYCvrNDs8jkh 4L/Izkbmq3vqzULrtplAGl/lB7MaWMGd31IY5gHTSs9sdIIaeh9UCR5vMzx3zdq6AjShRFI1uV0 zhZVJ2yJsgpRMqb8PtO3yn67fZ8Q4ED3SwWdlgMNAXGAv3FR9GiiXzqbbc+6co/0y0dTnZHXs38 crolmbNlIcjoxDRCvgDv2B+gUGUukdphsDdQSEFWtryyo= X-Received: by 2002:a17:903:41c3:b0:2c2:245a:3366 with SMTP id d9443c01a7336-2c7c76ea630mr10145015ad.27.1782183487772; Mon, 22 Jun 2026 19:58:07 -0700 (PDT) Received: from haichao.tail057a43.ts.net ([2001:da8:e000:1206:932e:e78a:5805:78b7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c7436af305sm101944795ad.6.2026.06.22.19.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jun 2026 19:58:07 -0700 (PDT) From: Ruoyu Wang To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Simon Horman , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ruoyu Wang Subject: [PATCH net v2] net: sungem: fix probe error cleanup Date: Tue, 23 Jun 2026 10:57:59 +0800 Message-ID: <20260623025759.3468566-1-ruoyuw560@gmail.com> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit gem_init_one() calls gem_remove_one() when register_netdev() fails. gem_remove_one() unregisters and frees resources owned by the net_device, including the DMA block, MMIO mapping, PCI regions, and the net_device itself. gem_init_one() then falls through to its own cleanup labels and frees the same resources again. Keep the register_netdev() error path in gem_init_one(): clear drvdata so PM/remove paths do not see a half-registered device, remove the NAPI instance added during probe, and let the existing cleanup labels release the resources once. The issue was found by a local static-analysis checker for probe error paths. The reported path was manually inspected before sending this fix. Compile-tested with CONFIG_SUNGEM=y. Runtime testing was not performed because no sungem hardware is available. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Ruoyu Wang --- v2: - Add a Fixes tag. - Describe how the issue was found. - Add testing information. v1: https://lore.kernel.org/netdev/20260620155326.80582-1-ruoyuw560@gmail.com/ drivers/net/ethernet/sun/sungem.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 8e69d917d827..26974ee71352 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c @@ -2986,10 +2986,10 @@ static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->max_mtu = GEM_MAX_MTU; /* Register with kernel */ - if (register_netdev(dev)) { + err = register_netdev(dev); + if (err) { pr_err("Cannot register net device, aborting\n"); - err = -ENOMEM; - goto err_out_free_consistent; + goto err_out_clear_drvdata; } /* Undo the get_cell with appropriate locking (we could use @@ -3003,8 +3003,13 @@ static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->dev_addr); return 0; +err_out_clear_drvdata: + pci_set_drvdata(pdev, NULL); + netif_napi_del(&gp->napi); + err_out_free_consistent: - gem_remove_one(pdev); + dma_free_coherent(&pdev->dev, sizeof(struct gem_init_block), + gp->init_block, gp->gblock_dvma); err_out_iounmap: gem_put_cell(gp); iounmap(gp->regs); -- 2.51.0