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 72ECB2E6106; Tue, 15 Jul 2025 13:50:08 +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=1752587408; cv=none; b=GHeaFgWXjtRWrjOOU2kneEYbTOp5YPL2VhTBRxeeP+1k1XyX7qUJrAxpHMQffmGwF1YYGB+DoweJ9qJmI/D5UfB9hKC4py1Gl5/65/jHAsgPxRPyjSNBvJb3u6/yKYVvgVvnpLQfuXOclZEfa23Gsr837m5q/Hy3gBeP6ts3XvE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752587408; c=relaxed/simple; bh=nN5KGdMlNo9TvySt3nWFEZuiurQ2/5/h9FHYhk4SrGk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jsu59aRz5J6jhlGoPOGMtCg9nBhG1itlu20K4zjaSWG07DnZ2sBKbl7gqMfKiwJ/aAjrXpuwFQMNcFrqasocxqU5yGAKENjMTHSNRvoC8Mk7LanNrB66vOMp01R1sWeI8HdNiu+wz+J3DGB37vLz4kixwnCmyYJ/n0yFgPc1dE8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CusBbeQK; 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="CusBbeQK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B57F5C4CEE3; Tue, 15 Jul 2025 13:50:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752587408; bh=nN5KGdMlNo9TvySt3nWFEZuiurQ2/5/h9FHYhk4SrGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CusBbeQKzmF4j6V6veiUcd/Rvs4nKU5qEWxgZ6ESuzY8CQ+xIYkQy9C1hep2adxIE VTAuyMu2cCJFE5MpZd1i+qfjOv+mO3Jwgr7cA5CB06W50Pj3uXYw8dT2vvxGtBll38 Ff0AVPSzkNFFb+yPobbilAfzAZ+ryRc6TtkDh6LY= 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.1 73/88] atm: idt77252: Add missing `dma_map_error()` Date: Tue, 15 Jul 2025 15:14:49 +0200 Message-ID: <20250715130757.503703557@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130754.497128560@linuxfoundation.org> References: <20250715130754.497128560@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.1-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 7810f974b2ca9..d9ee20f0048fe 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