Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3188028pxf; Mon, 5 Apr 2021 05:44:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJdQTES0OyT5UOnSwTzIEb4RlZt/tC+6Mi8qaIHTdzMV7UPnBzMQRvr9zWBjDvWafdlLrX X-Received: by 2002:a17:907:3e9e:: with SMTP id hs30mr28768747ejc.66.1617626650038; Mon, 05 Apr 2021 05:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617626650; cv=none; d=google.com; s=arc-20160816; b=p/hmJ3XbVFBAl1+pPEsCkmpVeiAnZ4Ap0G2C68rVuY4ugAQ8wSPmEKN5yPJB/Jvbt2 YbQackqL7XxlxURWwzeu1bC/0JwAFHTcEKfJU0u75brzLWC1j0JyR4evJ4Zbgzn2AiTq LhM2LcZKFTaKcQlJ0t1G9hDAnCiNfjLwslldFpOrtnN4hJQIxqUN5SbhSeBwsXeTQZp3 tHeMs027B1ITNS8RITAeN/Hswd2e48Shg4xzM5Txg0281VLYL/pZwcIXCqxwTlyhev3S UqEHlAp467u9UgPaLOW3ZNY9dANllYIsvfdFoTvbCjk4VFPGs05wJ+OEatwygZm8dRGa bKVQ== 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=iyukapmo1XJZ+KDCeL/fE2ozs2uuzDvHlyjXb6QAPFs=; b=eHcelfBZ3MRBJQP+hMHv9D+QirP3UInu0FQNe97eXVW96ps15M/tU5q7ibqt0/ulHk 79hZvip4VDxsAVMPDo4DGtRVDQFfrFUR1VgH0+QzgjkLxzLfkYdP4963Y6XdBWMxpszs txFoJBOEerPecfzXa53VjrDp3ROLYMa5FtT4qjEx3q7df2+B6J14qfwyQUeQxEjYHjSv 1D07oyNYzK3G1wsgFDGhbGCkmgouDT/rgJu6pAk7b7bHyLmt6KGTYbSDlrpuFvpagzLF pCOtQMBl2+WGXPEuNVRUtuw6zqrRdpKEFUpB5E76G+yoMcknZs9ifMJ75/BbmrXIerAw hxxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=fzAW4gg7; 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 i15si13195745eje.718.2021.04.05.05.43.46; Mon, 05 Apr 2021 05:44:10 -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=fzAW4gg7; 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 S237238AbhDEJAm (ORCPT + 99 others); Mon, 5 Apr 2021 05:00:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:41224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236891AbhDEJAA (ORCPT ); Mon, 5 Apr 2021 05:00:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E86E460238; Mon, 5 Apr 2021 08:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613194; bh=LHdZhhen3vKYu4pE0APWOszXTbH6gJF9/gz9z/fbL84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fzAW4gg7o0DF+Jypk4fptRH62uf3C58ViSIfwdhLf6B3c+Cb8rRYsDLmWWhbpywvB uZJffgYG0WlHRySI2a81cJlgYXvVo9l3P09JT0cojN9BsLaw3F23v/ApXi8aJJUE8q SMYcOQqa+2gsX74X4mrmpiSv96m3UCGF9PX7qoRA= 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 4.14 30/52] drm/amdgpu: check alignment on CPU page for bo map Date: Mon, 5 Apr 2021 10:53:56 +0200 Message-Id: <20210405085022.967531890@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085021.996963957@linuxfoundation.org> References: <20210405085021.996963957@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 @@ -2074,8 +2074,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 */ @@ -2142,8 +2142,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 */