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 5CE9B2E5B06; Tue, 15 Jul 2025 13:26:52 +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=1752586012; cv=none; b=UwI+cRVBC6cY8BQipEE2Azn1IKs/wG/pWcbKckRN2Tjl9o34D6Vlf/FGLKrGqVmQphyUd/YnMJ+aEulR+t2Kbbt0q+VpT5qtySsZESKz+YUVQgTd7Opy5lN9oerxbqzbsI/th3j4xFOQ1IuZ4aO+GVibs4LjhdDqVYfUEawxxbs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752586012; c=relaxed/simple; bh=q7CXoPkMk4SR0K/myC8IEv0OSK8lPulb/ct4WpD6WVk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Na/Bv/FXKhEZpitH0XG0mg9MVmYgnJQC5Ny/qa6VWfZNZlNQEdF2+PJgMEef7g7iqYwiIQFJM55naNJZ6CKYCKnlJdsu9Trct0ttmYG8KYVv+EEnyrMZfizeASvesep2pz/4Q4pu7UWQB8vN2b9kyrAuVJABh66P9AsEki9Yf+0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=04kWZDU1; 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="04kWZDU1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3003C4CEF1; Tue, 15 Jul 2025 13:26:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752586012; bh=q7CXoPkMk4SR0K/myC8IEv0OSK8lPulb/ct4WpD6WVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=04kWZDU1XZHsS+4l7eygilDOB2QJ6IJ8szYvI4Yhp7/2hdhvqmASd2hI2hnkKolKE LlN7nHQZ8Amx4pjNvrLdDOkIBynDl+AGXIQHDlExJCiMEeGc/KcFLFJ9h/jEmmu59q aUjp/0URsrEcinu+EYR7ixvujiUKYCDiizB7QSYU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 092/109] atm: idt77252: Add missing `dma_map_error()` Date: Tue, 15 Jul 2025 15:13:48 +0200 Message-ID: <20250715130802.567928146@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130758.864940641@linuxfoundation.org> References: <20250715130758.864940641@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Fourier [ Upstream commit c4890963350dcf4e9a909bae23665921fba4ad27 ] The DMA map functions can fail and should be tested for errors. Signed-off-by: Thomas Fourier Reviewed-by: Simon Horman Link: https://patch.msgid.link/20250624064148.12815-3-fourier.thomas@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/atm/idt77252.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index a876024d8a05f..63d41320cd5cf 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c @@ -852,6 +852,8 @@ queue_skb(struct idt77252_dev *card, struct vc_map *vc, IDT77252_PRV_PADDR(skb) = dma_map_single(&card->pcidev->dev, skb->data, skb->len, DMA_TO_DEVICE); + if (dma_mapping_error(&card->pcidev->dev, IDT77252_PRV_PADDR(skb))) + return -ENOMEM; error = -EINVAL; @@ -1857,6 +1859,8 @@ add_rx_skb(struct idt77252_dev *card, int queue, paddr = dma_map_single(&card->pcidev->dev, skb->data, skb_end_pointer(skb) - skb->data, DMA_FROM_DEVICE); + if (dma_mapping_error(&card->pcidev->dev, paddr)) + goto outpoolrm; IDT77252_PRV_PADDR(skb) = paddr; if (push_rx_skb(card, skb, queue)) { @@ -1871,6 +1875,7 @@ add_rx_skb(struct idt77252_dev *card, int queue, dma_unmap_single(&card->pcidev->dev, IDT77252_PRV_PADDR(skb), skb_end_pointer(skb) - skb->data, DMA_FROM_DEVICE); +outpoolrm: handle = IDT77252_PRV_POOL(skb); card->sbpool[POOL_QUEUE(handle)].skb[POOL_INDEX(handle)] = NULL; -- 2.39.5