From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E34827C161; Tue, 8 Apr 2025 12:56:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744116994; cv=none; b=u9VImTNC2gK45nnWBJ59YCNtG27r36yc60qlwDhsHBkoZb8aE73JJMv6W+R+lO0BcWY/KFbIxEt46ju9Mi7c7tAqscEa/tqYinScBTEHraORCsB9KqkXkQq9VZ/R9aKs5/YN5d3zuW41rRw6A/ByHMQmCszAOrRdsjZKbPc190s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744116994; c=relaxed/simple; bh=CS5gbXk3F7oDtMbfUvIf4V6Edn0AByIe8I7FWbrn0hE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B5SKmOLNLN26L02nMk0tvfLM5lgO3RcLPCP9eSUcq+CELeFIx4ryHXfyDeyc3PwUNTOffbcSSvFYw2t/LbIK5oeywmqzj6J0s6opYfNF9Eerd+a7XXywMNSO3bRrQ9tezUjqoLkCZ1QVF0lHM0DFUDmwC14RJeSmByi3xhs9eS0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Cil1LS/F; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Cil1LS/F" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4CDEC4CEE5; Tue, 8 Apr 2025 12:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744116994; bh=CS5gbXk3F7oDtMbfUvIf4V6Edn0AByIe8I7FWbrn0hE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cil1LS/Fk23zeo1VL9XgRy78rtGXJmxWkltGj85GvJpPcBb9U0DD0aZpbgkQ9+Cpl adMu/GjSvBay0Zglm6R7dPWDg3Qa94dGlS4ZRibTWn0Wd6oP6uPbiWaE2zLFWeMIzG fQowQRdRzk1vb4LxRLH8xdeOZ9CfuQZaMBSRUc0U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Henry Martin , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 343/423] arcnet: Add NULL check in com20020pci_probe() Date: Tue, 8 Apr 2025 12:51:09 +0200 Message-ID: <20250408104853.828439232@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104845.675475678@linuxfoundation.org> References: <20250408104845.675475678@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Henry Martin [ Upstream commit fda8c491db2a90ff3e6fbbae58e495b4ddddeca3 ] devm_kasprintf() returns NULL when memory allocation fails. Currently, com20020pci_probe() does not check for this case, which results in a NULL pointer dereference. Add NULL check after devm_kasprintf() to prevent this issue and ensure no resources are left allocated. Fixes: 6b17a597fc2f ("arcnet: restoring support for multiple Sohard Arcnet cards") Signed-off-by: Henry Martin Link: https://patch.msgid.link/20250402135036.44697-1-bsdhenrymartin@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/arcnet/com20020-pci.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index c5e571ec94c99..0472bcdff1307 100644 --- a/drivers/net/arcnet/com20020-pci.c +++ b/drivers/net/arcnet/com20020-pci.c @@ -251,18 +251,33 @@ static int com20020pci_probe(struct pci_dev *pdev, card->tx_led.default_trigger = devm_kasprintf(&pdev->dev, GFP_KERNEL, "arc%d-%d-tx", dev->dev_id, i); + if (!card->tx_led.default_trigger) { + ret = -ENOMEM; + goto err_free_arcdev; + } card->tx_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "pci:green:tx:%d-%d", dev->dev_id, i); - + if (!card->tx_led.name) { + ret = -ENOMEM; + goto err_free_arcdev; + } card->tx_led.dev = &dev->dev; card->recon_led.brightness_set = led_recon_set; card->recon_led.default_trigger = devm_kasprintf(&pdev->dev, GFP_KERNEL, "arc%d-%d-recon", dev->dev_id, i); + if (!card->recon_led.default_trigger) { + ret = -ENOMEM; + goto err_free_arcdev; + } card->recon_led.name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "pci:red:recon:%d-%d", dev->dev_id, i); + if (!card->recon_led.name) { + ret = -ENOMEM; + goto err_free_arcdev; + } card->recon_led.dev = &dev->dev; ret = devm_led_classdev_register(&pdev->dev, &card->tx_led); -- 2.39.5