From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D5AE23128CC for ; Tue, 16 Jun 2026 01:07:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781572062; cv=none; b=IzOyR3xHUvJkyUTzviu6YCiY98Xf65ECNb6cmJSy3w9laQElvCaU4zL6SmHPVlQ+nVQPb4tJThNKYe4mHboKQMOYUHeAodoacydI9W7zv5m2WXV3o5REI46sqg30PtXdFlLZvY4Huyn9WVF2J5dGBhtpTrkEhKmKqfPb/YXuaTU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781572062; c=relaxed/simple; bh=XX9NREEVL4LcB2J0tgseR8DPRAVA2lLy4m5DDY7AohU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kZ1oEMkFnTfrPNyAdZh7RI64ymdtO/BAHq/IQEAqRzJn8dR8ES59hEeftSQhcXtU8prR90zKxKh5mvs3ecKZ7WHXNsQ4tszlQSvym01O3Jl3Gcg8OqHaLYK2K6mNAJQkxCU+uNKG1K8tUj1gau1tl8DSfpevWBl3xTnJ3VVSLyE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Dxw2nhp4; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Dxw2nhp4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AD2F1F00A3D; Tue, 16 Jun 2026 01:07:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781572061; bh=KFjx4yAs8YVVPzl3rDzoomN4IkY3u5v7ji1eWL/E2ZQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Dxw2nhp4OEI0dZeeusLc+7AuhL4JXs0hBGiYkuOBX3BFyRlUpCNQy6hOKbywcrsfx yOxVUnKN9ejkjQot+w/L5hjY/9/e16tBRUhpL/VXblxDrcYzYruXNTT+5c2GWe0rb9 MKPX42NXl0RYQf9ovmSd0bsZKsHrJBP/7BrJVgMqeyXS5rC9JVX+24/i/Cic0VDFrp mx/fWOaKXH20tsXL93dd3sIYPbfRvYe9Ph6iQT52mwqJMnx66BEfCtRBoKLUl74VGm FcYxPsQ9C57KNQNWqm13X0JImAxQr1ppMMmacoAjudmUPcNf/v8n9/Mo0yu+ZAXvt6 cFayW31jByCgw== From: Sasha Levin To: stable@vger.kernel.org Cc: Jason Gunthorpe , Sasha Levin Subject: [PATCH 5.15.y 3/3] RDMA/umem: Fix truncation for block sizes >= 4G Date: Mon, 15 Jun 2026 21:07:38 -0400 Message-ID: <20260616010738.2640782-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260616010738.2640782-1-sashal@kernel.org> References: <2026061511-anchor-wriggly-5b25@gregkh> <20260616010738.2640782-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jason Gunthorpe [ Upstream commit 15fe76e23615f502d051ef0768f86babaf08746c ] When the iommu is used the linearization of the mapping can give a single block that is very large split across multiple SG entries. When __rdma_block_iter_next() reassembles the split SG entries it is overflowing the 32 bit stack values and computed the wrong DMA addresses for blocks after the truncation. Use the right types to hold DMA addresses. Link: https://patch.msgid.link/r/1-v1-88303e9e509f+f7-ib_umem_types_jgg@nvidia.com Cc: stable@vger.kernel.org Fixes: a808273a495c ("RDMA/verbs: Add a DMA iterator to return aligned contiguous memory blocks") Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/iter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/core/iter.c b/drivers/infiniband/core/iter.c index 8e543d100657ee..3ed351e8fcf6c9 100644 --- a/drivers/infiniband/core/iter.c +++ b/drivers/infiniband/core/iter.c @@ -19,8 +19,8 @@ EXPORT_SYMBOL(__rdma_block_iter_start); bool __rdma_block_iter_next(struct ib_block_iter *biter) { - unsigned int block_offset; - unsigned int delta; + dma_addr_t block_offset; + dma_addr_t delta; if (!biter->__sg_nents || !biter->__sg) return false; -- 2.53.0