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 12A141F37A1; Tue, 12 Aug 2025 19:18:44 +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=1755026324; cv=none; b=Pnwg1qoAt0Q7otOQmoBxwKSvfH3BYhXzl7GtY5zMqXY9B2FtGqopuBxJ+O0cvJ3G/QhH0dr7YtH2+4ihsSx7hFmvAgxSogSqllnbZ0lbpSUps5NMF16F6IOEn86dVvt+qKdJjYLzuqSuDwnsVDA1TBySoiYxeCWsjXhIlk9Zaws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026324; c=relaxed/simple; bh=8gv1zN5Few81N8UpZ+d1SCHkNLDDuFKKidGX/yqgfWw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B9PsTtpQEhS+z9K+11VMlc4ofzlstJ50BEYBM/UXbXCIfgzkrR9b/ktpn2wj28pTnbjYg/bPvc6Hu+V/dZijaBN3bJ+tCVKUXafY9pxsFwSzlQpMBfaq3Y8c+erU2N6e0rYgo2EhGop7xcZuv5SJ3OMP0HGZEpDdoLzkzblNJbw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=O9UAQLYP; 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="O9UAQLYP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D9D7C4CEF0; Tue, 12 Aug 2025 19:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755026323; bh=8gv1zN5Few81N8UpZ+d1SCHkNLDDuFKKidGX/yqgfWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O9UAQLYPb1lMgifrk7/zMXf397w1ZJda1BMakQf4lflEx3Y4ApAg4LTcqxE79mEIM IrWOqB2WDVP+jMJSc33RUJCe8hCPERvC5mRJN3k+urC4qESQt38Mj59dQ7E/By6LoA XSoZWgPyiMqC1AWdIgKZSYhIlJFdt8VHSEtmNOX0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thomas Fourier , Vinod Koul , Sasha Levin Subject: [PATCH 6.15 304/480] dmaengine: nbpfaxi: Add missing check after DMA map Date: Tue, 12 Aug 2025 19:48:32 +0200 Message-ID: <20250812174409.973849050@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@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 c6ee78fc8f3e653bec427cfd06fec7877ee782bd ] The DMA map functions can fail and should be tested for errors. If the mapping fails, unmap and return an error. Fixes: b45b262cefd5 ("dmaengine: add a driver for AMBA AXI NBPF DMAC IP cores") Signed-off-by: Thomas Fourier Link: https://lore.kernel.org/r/20250707075752.28674-2-fourier.thomas@gmail.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/nbpfaxi.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/dma/nbpfaxi.c b/drivers/dma/nbpfaxi.c index 7a2488a0d6a3..765462303de0 100644 --- a/drivers/dma/nbpfaxi.c +++ b/drivers/dma/nbpfaxi.c @@ -711,6 +711,9 @@ static int nbpf_desc_page_alloc(struct nbpf_channel *chan) list_add_tail(&ldesc->node, &lhead); ldesc->hwdesc_dma_addr = dma_map_single(dchan->device->dev, hwdesc, sizeof(*hwdesc), DMA_TO_DEVICE); + if (dma_mapping_error(dchan->device->dev, + ldesc->hwdesc_dma_addr)) + goto unmap_error; dev_dbg(dev, "%s(): mapped 0x%p to %pad\n", __func__, hwdesc, &ldesc->hwdesc_dma_addr); @@ -737,6 +740,16 @@ static int nbpf_desc_page_alloc(struct nbpf_channel *chan) spin_unlock_irq(&chan->lock); return ARRAY_SIZE(dpage->desc); + +unmap_error: + while (i--) { + ldesc--; hwdesc--; + + dma_unmap_single(dchan->device->dev, ldesc->hwdesc_dma_addr, + sizeof(hwdesc), DMA_TO_DEVICE); + } + + return -ENOMEM; } static void nbpf_desc_put(struct nbpf_desc *desc) -- 2.39.5