From nobody Sat Feb 7 21:52:50 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86F83C7EE29 for ; Thu, 1 Jun 2023 22:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231772AbjFAWo2 (ORCPT ); Thu, 1 Jun 2023 18:44:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbjFAWo0 (ORCPT ); Thu, 1 Jun 2023 18:44:26 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73CB012C for ; Thu, 1 Jun 2023 15:44:25 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id 41be03b00d2f7-5344d45bfb0so48660a12.1 for ; Thu, 01 Jun 2023 15:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685659465; x=1688251465; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UxHkwiqKdxLfYQYbwK7RXIfy2i2RSaxPzUwPry0EypI=; b=DhuuK1awpWZ+E3TBfFc1XXnS0izUJlS5HCoilkUp8uhyNdrIUsUNnSi5PXFLKLyOQ5 PBw9sJYYI/79wtGUvklbPmJZdVJai3uH8yxxL7+A4lkSyycuGhXBpnCwUUkt1Gx5vvfn EVBzg27fkC5VvfPgzFWqOitlwLyTeuN5YHWqt4eGo2hMIT4kNGnGaeY/hYoj5FKkmUfc bXJzmlaBlJ2gpj48botGTNd3HcC9BkPNjYfZPHr6w1+Bd5Wd75YRiWGxlx03+VBtSyj9 TVYhi5kFi+XO49sR/CmfgTk9QhIMbJovpaBWCJnT8drBA/UTpCSIUxxKt03epkaqIwKK oBkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685659465; x=1688251465; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UxHkwiqKdxLfYQYbwK7RXIfy2i2RSaxPzUwPry0EypI=; b=c/ezc7oE6BRnMh3w0Uu3dlAfa9M7+8KLUCMBWTmBrCycdWYSxuVZQxvCAUOlYdg/n1 QmEE6tl/1GvN5Fh514dABIMx1TrN3Ecv/Cg7Z5jF/7UfPvVQnUTanG4Izdm+a+alyB58 /+BKwQxwAs8o9E+JneJmYAVvVA097woThremZf+uc2P+rB5PiV6O0IDAF6K9X4BbH6hU GN0vwwsM5fKDvOvh5bua5A2UYvAiMxHW60zX4xBIWk1lDVIl3E3/phy5sxYTypLurEqH RgyGzYIbA3fHocoeJsy9wRqtmLoRyfzEzGfypTPVEhCIdRnnYlCs0iInWVT18uB5sbXm NTPQ== X-Gm-Message-State: AC+VfDw6OZ62DRecqnOa2fjEeDBFRotmh1UcNtWOcoD5hsWxqdbW3Uh+ UXPEAUxL3vD72UFvEUd406pWuac8o8D3hA== X-Google-Smtp-Source: ACHHUZ4rd6kVpQK8pfQmSVfOt8wBFkHWquxBu5ssRKjUzszOFtIfV6X/57VGphUe48U8aNQg5aEIuw== X-Received: by 2002:a17:902:e852:b0:1b0:3cda:6351 with SMTP id t18-20020a170902e85200b001b03cda6351mr10628056plg.0.1685659464812; Thu, 01 Jun 2023 15:44:24 -0700 (PDT) Received: from olv-ct-22.c.googlers.com.com (217.108.125.34.bc.googleusercontent.com. [34.125.108.217]) by smtp.gmail.com with ESMTPSA id 6-20020a170902c24600b001ac84f5559csm4024979plg.126.2023.06.01.15.44.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 15:44:24 -0700 (PDT) From: Chia-I Wu To: dri-devel@lists.freedesktop.org Cc: Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , Felix Kuehling , Philip Yang , Hawking Zhang , Mukul Joshi , Danijel Slivka , Lang Yu , =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= , Jammy Zhou , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] amdgpu: validate offset_in_bo of drm_amdgpu_gem_va Date: Thu, 1 Jun 2023 15:44:12 -0700 Message-ID: <20230601224419.2392422-1-olvaffe@gmail.com> X-Mailer: git-send-email 2.41.0.rc0.172.g3f132b7071-goog MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This is motivated by OOB access in amdgpu_vm_update_range when offset_in_bo+map_size overflows. v2: keep the validations in amdgpu_vm_bo_map v3: add the validations to amdgpu_vm_bo_map/amdgpu_vm_bo_replace_map rather than to amdgpu_gem_va_ioctl Fixes: 9f7eb5367d00 ("drm/amdgpu: actually use the VM map parameters") Signed-off-by: Chia-I Wu Reviewed-by: Christian K=C3=B6nig --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/a= mdgpu/amdgpu_vm.c index 22f9a65ca0fc7..76d57bc7ac620 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1434,14 +1434,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev, uint64_t eaddr; =20 /* validate the parameters */ - if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size =3D=3D 0 || size & ~PAGE_MASK) + if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK) + return -EINVAL; + if (saddr + size <=3D saddr || offset + size <=3D offset) return -EINVAL; =20 /* make sure object fit at this offset */ eaddr =3D saddr + size - 1; - if (saddr >=3D eaddr || - (bo && offset + size > amdgpu_bo_size(bo)) || + if ((bo && offset + size > amdgpu_bo_size(bo)) || (eaddr >=3D adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT)) return -EINVAL; =20 @@ -1500,14 +1500,14 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *= adev, int r; =20 /* validate the parameters */ - if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || - size =3D=3D 0 || size & ~PAGE_MASK) + if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK) + return -EINVAL; + if (saddr + size <=3D saddr || offset + size <=3D offset) return -EINVAL; =20 /* make sure object fit at this offset */ eaddr =3D saddr + size - 1; - if (saddr >=3D eaddr || - (bo && offset + size > amdgpu_bo_size(bo)) || + if ((bo && offset + size > amdgpu_bo_size(bo)) || (eaddr >=3D adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT)) return -EINVAL; =20 --=20 2.41.0.rc0.172.g3f132b7071-goog