Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3326688pxf; Mon, 5 Apr 2021 09:06:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbheB6kIRc88Zkuc+p/CHOJgdGmQHdy8H9paDx5/RdEDsPvgTX6daZfsEQt+Z9dIIo9vE4 X-Received: by 2002:aa7:c403:: with SMTP id j3mr32435505edq.137.1617638800765; Mon, 05 Apr 2021 09:06:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617638800; cv=none; d=google.com; s=arc-20160816; b=yozKFFNfpgpBTyqmUcbZ2hIl0p88J6W1e9GvYka4R81RgzFX4aVMZkLAZ08NjGQX86 T9K43nTf4p2k97y8mqbg8dYUcHVvt8EtRilNTOcx+07xuqAnjG97XFZovDB593oHG+pA lzdQD/qDXS6PRr6nakpkaVYGVyK1fuRj34+IgBAG0rYy/0VbThRr9vjeWQwQy/IGgbkw UDayzuuL2/a3LZB0aaYPVLrHW5I4Eph3hjw20lP7vGCmPQt4v3tf1B0UNkDbN0luBoSN seywsCD2w3NxV4XxF/ICojJkeuDB15WEBzyGM54wMrjUsJPx8mSHPyopjeljdVRCwj8B jgkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tvTlFW/YwB5L40jfhoY/zIUbXIh8Vcm6/CTMn0Gtn3w=; b=RF9znCuthUgyf5OCUedv14MAcmSJ0nN+5HHLuzrjNzsnBKlM1yav5UXfYY5AxaTd9X zwXJV8r/LSD1bx3FR9Ni1EYWbm8om8KSGSC5yQgomhmg95wwQUCIZQg4Jht5H5KdyxXG Murx7JPrz4bGShlzcg23H8w/+/5R2Gg8DBsS/vjz/UjExyBfSuNNx1giIt86DUmLrTED aQzlo388wvRvvpr61zKeIAtMQwkraQo6EhQrbWU4epXtMoZrmIiJZvoMIN36VKDSlJOh aqVFjwPyI4hyQhgX8wj0B685vIIv8IAQJTK+AonY6mRY+0rnGITbayqA9PUoJTrX9H8w dufQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=erA8KAL0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q4si5696870eji.92.2021.04.05.09.06.16; Mon, 05 Apr 2021 09:06:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=erA8KAL0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239649AbhDEJOG (ORCPT + 99 others); Mon, 5 Apr 2021 05:14:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:56920 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238968AbhDEJKg (ORCPT ); Mon, 5 Apr 2021 05:10:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 04A62613A6; Mon, 5 Apr 2021 09:10:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613817; bh=rJlMRvhjDo1dGqC4WbejyL8swy0CCcTAqluvI6szj10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=erA8KAL0/7vVyhdfBcN5IDGe13miPkdkB3NcKG4DHwzBq7ZCdpMcuPL5rfpyiv2dU UJfybw2KRUUd6hKL3WOgOfuBx04Wz9NLPbi0U6QrD8eJRsb9cVAI+QYHFlSCNKb14m 4Xfavt60q5eVKSSdRd4kSPHbZe8TXP3L7aqqzfe8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Xi Ruoyao , Alex Deucher Subject: [PATCH 5.10 075/126] drm/amdgpu: check alignment on CPU page for bo map Date: Mon, 5 Apr 2021 10:53:57 +0200 Message-Id: <20210405085033.541885438@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085031.040238881@linuxfoundation.org> References: <20210405085031.040238881@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xℹ Ruoyao commit e3512fb67093fabdf27af303066627b921ee9bd8 upstream. The page table of AMDGPU requires an alignment to CPU page so we should check ioctl parameters for it. Return -EINVAL if some parameter is unaligned to CPU page, instead of corrupt the page table sliently. Reviewed-by: Christian König Signed-off-by: Xi Ruoyao Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -2223,8 +2223,8 @@ int amdgpu_vm_bo_map(struct amdgpu_devic uint64_t eaddr; /* validate the parameters */ - if (saddr & AMDGPU_GPU_PAGE_MASK || offset & AMDGPU_GPU_PAGE_MASK || - size == 0 || size & AMDGPU_GPU_PAGE_MASK) + if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || + size == 0 || size & ~PAGE_MASK) return -EINVAL; /* make sure object fit at this offset */ @@ -2289,8 +2289,8 @@ int amdgpu_vm_bo_replace_map(struct amdg int r; /* validate the parameters */ - if (saddr & AMDGPU_GPU_PAGE_MASK || offset & AMDGPU_GPU_PAGE_MASK || - size == 0 || size & AMDGPU_GPU_PAGE_MASK) + if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || + size == 0 || size & ~PAGE_MASK) return -EINVAL; /* make sure object fit at this offset */