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 045DE389471 for ; Tue, 28 Apr 2026 09:02:45 +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=1777366966; cv=none; b=P+vHgs5GF885KRqs3mvkZwAGSUOuAeDOVBhrKETdKDfweV3VNkfrmVIjuaS8yRluYMAFG8ABCzpoA5XqJ26tZXDrgVL4bWT17HnDfqjJdvjowpyqVjJdMUt9lKZmuLTrsdapws52wPMaxWbKWnxnzRWz0VFXbLgpnUjX73voY58= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777366966; c=relaxed/simple; bh=rR9IbszD2tDZROo4UNsyver5xL1kfbtpVdyrDg0qJNA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QHopfQMOJC5hQJHKsdijJ7+fOtbLjeH3FYhaL/Ina8NVdJH0yslk0prYu9sBlzoaAl2HKYa6xaxxPdUZKwe4Jwiv/n/BvOjRDd/GuP19VKEKWLsHq6fPV0CZ3xOcfnVrB9RhoRRAUNl+eNVx9x1CVo9av68wc3YyuoFbNnuuKys= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AE79cyOW; 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="AE79cyOW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DAAFC2BCF4; Tue, 28 Apr 2026 09:02:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777366965; bh=rR9IbszD2tDZROo4UNsyver5xL1kfbtpVdyrDg0qJNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AE79cyOWSRyWec/Xwn9mSXH8L2nPpt7OMymuksQ2lw6dF+RuyZ3M2bHxgBIVRaM8f ICKDAdQlcMzpIMM1LipDzad99Vu/Eo5dKVyrM0j2+Pm0nTMdM403/DQj3ZmEIK+mw+ TTpT7fhFz+4ToraFK3TBu6d34cjkbdA2oTPvbtmHVFzTmlpJrNDyIkOLhNBAHWuXZ+ mISWZ/C9UrpzE863DRTOChAB2sey4jty/KgngbCUogk+kHE3AobX1CM7cxVFRRincm PgWb6kQvbYV/+wZC3Z5KOYtbjbtmcf8eZ8ys4LXOfJNUOHNE/ZC/IUL+prJLzbLo+C tcKzmT87HBvmw== From: Sasha Levin To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , Lyude Paul , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , stable , Sasha Levin Subject: [PATCH 5.10.y] drm/nouveau: fix u32 overflow in pushbuf reloc bounds check Date: Tue, 28 Apr 2026 05:02:42 -0400 Message-ID: <20260428090242.2131744-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026042712-extrovert-oblong-a615@gregkh> References: <2026042712-extrovert-oblong-a615@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Greg Kroah-Hartman [ Upstream commit 2fc87d37be1b730a149b035f9375fdb8cc5333a5 ] nouveau_gem_pushbuf_reloc_apply() validates each relocation with if (r->reloc_bo_offset + 4 > nvbo->bo.base.size) but reloc_bo_offset is __u32 (uapi/drm/nouveau_drm.h) and the integer literal 4 promotes to unsigned int, so the addition is performed in 32 bits and wraps before the comparison against the size_t bo size. Cast to u64 so the addition happens in 64-bit arithmetic. Cc: Lyude Paul Cc: Danilo Krummrich Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Reported-by: Anthropic Cc: stable Assisted-by: gkh_clanker_t1000 Fixes: a1606a9596e5 ("drm/nouveau: new gem pushbuf interface, bump to 0.0.16") Signed-off-by: Greg Kroah-Hartman [ Add Fixes: tag. - Danilo ] Signed-off-by: Danilo Krummrich [ Kept 5.10's `nvbo->bo.mem.num_pages << PAGE_SHIFT` instead of upstream's `nvbo->bo.base.size` accessor. ] Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index 567b43aa4a317..93c1afff5e90e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -618,7 +618,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli, } nvbo = (void *)(unsigned long)bo[r->reloc_bo_index].user_priv; - if (unlikely(r->reloc_bo_offset + 4 > + if (unlikely((u64)r->reloc_bo_offset + 4 > nvbo->bo.mem.num_pages << PAGE_SHIFT)) { NV_PRINTK(err, cli, "reloc outside of bo\n"); ret = -EINVAL; -- 2.53.0