Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3264238pxf; Mon, 5 Apr 2021 07:35:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuL9FmY8Toi9o7MdLp4cQx7OvexJs8KmZKMJ3USZw0Zt/UEh1teMqzRmX/GLhYZklPYNKY X-Received: by 2002:aa7:c3c1:: with SMTP id l1mr32236667edr.208.1617633325794; Mon, 05 Apr 2021 07:35:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617633325; cv=none; d=google.com; s=arc-20160816; b=yuk5CJFtkezodtYmMJ27t/FPgMTyOm2OuD7l4cGlnL8Mi05jIAUhhMTCFDgAA+hIKm 8wSJu5OzTu/J6+jm/JRLDjdQgys1yur8n4lBhhH78PHygYQSe5LWu/HYTIPg52En4fvW KTIQQMOQfb0E04ffid+mVVQ9i9VvVd0EilIV22m8gfOBwF27RhBVyyTsFi9dVMX+aBgf ZGEMqjQjPGF7lMt27SNScMzfyWtMDqheIzlcQo1VGi3OPWNTH2Zhnn+W/Lv7JQr4Lpjm LB5U/FU8CoPfkx9LYLUxRB8i0fzjRvcD41f+dNDzEB0enOgtXFh35wpW6OTp8KStpr/b xgVQ== 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=qvZN3WxnUezj2FfiROY/GOp7JYLEzbHmG3/Uhc0zYZw=; b=lIirF+x1CKbAWOmFnODiQ1zuKmCqP3zVtnXf5+zrInjOcuqTCnfWPnBTUhXlhNLHch UKpxg1Z8E1M6hnAdnqfgB86dADiBZ9HRppuIyA7mo8Ouh2DutpcJ69DvSFMwW7IzL8+w bG3tpjvill7xQWKqqPLlNDOe1ZbTOlc8W5WlTi+QmHMycvcdI8lMqjq1ASLNAaeJIxCa mjy5YEUzJmLR8u7ALHwdo8pVkB+hIPeddohavAw9PdHjKfQA+NikKtBDX8F/lNi0d01Y zuD4JyH5b+J0YM4dioccbZSKdNNDSedMDGDPk9ErmJW9kVxWd4j5VGLnXIPS44wspMXS NFEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nhlGwFNT; 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 bl5si13377334ejb.232.2021.04.05.07.35.01; Mon, 05 Apr 2021 07:35:25 -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=nhlGwFNT; 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 S237740AbhDEJDq (ORCPT + 99 others); Mon, 5 Apr 2021 05:03:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:43802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236753AbhDEJCC (ORCPT ); Mon, 5 Apr 2021 05:02:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9704D61394; Mon, 5 Apr 2021 09:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613284; bh=3YldFbS0jeDrOqBvwJCNGPj6AF3aTcml6rBFENGn7ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nhlGwFNT66t7ZRbgxuj99oz1nKuGZQViSmwtF2/2XIR9NYHNo0dkyFauocxyMZazd V2/8D5sSkcKCHEdZ1Dki8EfcjAIGRi+huxSuvGvVOtWiAFglgKJjQYP1pd/sq9KSk8 kLNsbzXukvsCFi0YJN6UvW/SBRNamas1K3GzE6PQ= 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.19 37/56] drm/amdgpu: check alignment on CPU page for bo map Date: Mon, 5 Apr 2021 10:54:08 +0200 Message-Id: <20210405085023.716805033@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085022.562176619@linuxfoundation.org> References: <20210405085022.562176619@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 @@ -2076,8 +2076,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 */ @@ -2141,8 +2141,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 */