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 30EE62ECD02; Tue, 15 Jul 2025 13:45:02 +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=1752587103; cv=none; b=pbeAqhB+uMemgeKx5hm8dB2/+JY/k35vNufWJy1H62EV8YeLyN2WyCu2usumuqk1G2qF+1uL7uGQ31vIVy+dOyRv/tCsJlERU6m/tVe+DbRaLN1KFZiqG/HLCbSQKbBF3paF63fRJ1Z8aZQkg6pSL4ZLA/gj+ibiyapwIf37OCE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752587103; c=relaxed/simple; bh=e3Aze4DE8I788ghCLanMeZJh+n9xnc+E6Ms2ZrM8N4g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GcJ3IPCPQvHvVo1t+toWSKsgiYXFqC7Ab11JqQPBbCxBW/bz6fU/wjrJTyWSQdMbptsvUO+NtLC0oYJyG8MQ/epNa+brJ/9tdywvD3pxDleJ+dCFTVKPqDWZPsGx6OuVtbqPiRd8Vrgsr3tXfS8iS4SKdZMczpQ8mTGX41DhHKo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ck5e0wO7; 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="ck5e0wO7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75B93C4CEE3; Tue, 15 Jul 2025 13:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1752587102; bh=e3Aze4DE8I788ghCLanMeZJh+n9xnc+E6Ms2ZrM8N4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ck5e0wO75FgFZSvGuClBM5Bb8egphUzMSGO4kICQtEDZS025XshTd4gz9PQezE/ZJ ZL1zPLDd2mB0MLnQ/zKZZvui5LRH/x1GCb3oOZxk4lsuJKsrepHLyq7YzI1PehWS2V I7JM+s4+wdf8U34yWJcppl3YmalBunyg58ijlT3E= 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.15 168/192] atm: idt77252: Add missing `dma_map_error()` Date: Tue, 15 Jul 2025 15:14:23 +0200 Message-ID: <20250715130821.656256246@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250715130814.854109770@linuxfoundation.org> References: <20250715130814.854109770@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.15-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