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 18B1B3D2452; Sat, 28 Feb 2026 17:40:27 +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=1772300427; cv=none; b=SIXah/L+4WzsCPN61+hXgXwnfvRXdR2l+indB+c1v/zDJZ4EZflohsRZauju/7l92k1IX7dQ2G1ZKY5qLBJnSWu+q39UQm6r+VCeBop6d08DhY0mb2chDOjp04NxmByAFNqOyShJ0LLGs8VKBXhSJgvAdEm7xhd72yIgPkMDI2k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300427; c=relaxed/simple; bh=dLPGJNofiRNB53LoWfuvKRZy9fh8nZFlbeV2LQiNivc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p1oQbHN9x9X/wKbPoBYZpgBaPqBjEzxS+vZDlHD9PRXb8YE5nTzqqkVqR/tJXi1tRq2Hb5ZZwHRq6scS5HpNROU2z3QrnQ4KK4dlNyKQ2eKnI2HspmaL7HvF9mtsT89tr1UHder/9LI7bi8kFzNVceaCKH7RPZT4ozHYt8vwylA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XPZPSa+h; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XPZPSa+h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64C5BC116D0; Sat, 28 Feb 2026 17:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300427; bh=dLPGJNofiRNB53LoWfuvKRZy9fh8nZFlbeV2LQiNivc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XPZPSa+hPDPro9iRvtV+yl2Mxx8Ir0G30tVjNlSge69z1An9pIUZYQGO0148H3azO 9Vqk3Y2mLhLL7Eskrp2bDYIOzm6z8c4m6Qbnho2tThgmJegZP3Vpw+0GSzSyabp0kH pohbsmMJQ6XDk6DGul3XQeLbjV7PHcRDQEYpaspRAgACgnMz+2FUyKD9dm0NK93X5C 2tcxzrNZcRbYf8MVCKByblMCm0g4HfJaikEWQZ/xKIf2BCtw7HDyr4L2wM179m0XI1 /XEY1RAeKvf3dDTul6tL0XUmVCXFyV6D0CFGtzlFMS7bUvpKSA2aiD0/bzoRTx3ZoH qnfEJ8sQucwQA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jiri Pirko , Marek Szyprowski , Sasha Levin Subject: [PATCH 6.19 465/844] dma-mapping: avoid random addr value print out on error path Date: Sat, 28 Feb 2026 12:26:18 -0500 Message-ID: <20260228173244.1509663-466-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Jiri Pirko [ Upstream commit 47322c469d4a63ac45b705ca83680671ff71c975 ] dma_addr is unitialized in dma_direct_map_phys() when swiotlb is forced and DMA_ATTR_MMIO is set which leads to random value print out in warning. Fix that by just returning DMA_MAPPING_ERROR. Fixes: e53d29f957b3 ("dma-mapping: convert dma_direct_*map_page to be phys_addr_t based") Signed-off-by: Jiri Pirko Signed-off-by: Marek Szyprowski Link: https://lore.kernel.org/r/20260209153809.250835-2-jiri@resnulli.us Signed-off-by: Sasha Levin --- kernel/dma/direct.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h index da2fadf45bcd6..62f0d9d0ba02e 100644 --- a/kernel/dma/direct.h +++ b/kernel/dma/direct.h @@ -88,7 +88,7 @@ static inline dma_addr_t dma_direct_map_phys(struct device *dev, if (is_swiotlb_force_bounce(dev)) { if (attrs & DMA_ATTR_MMIO) - goto err_overflow; + return DMA_MAPPING_ERROR; return swiotlb_map(dev, phys, size, dir, attrs); } -- 2.51.0