Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3064909pxf; Mon, 5 Apr 2021 02:09:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf06yOvkdAQaVyI2BQ+7ld3NGRFbY8WjkRbyWgMRpLRM4pGZa0a9qYPU+3VbwA/eeztclb X-Received: by 2002:a92:d78f:: with SMTP id d15mr18912173iln.112.1617613757142; Mon, 05 Apr 2021 02:09:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617613757; cv=none; d=google.com; s=arc-20160816; b=hg3QWfGoWsysxbAJoOOT1RTl31rpjB7VQ1JZDAO+pTKaWa3xsI0BtDd7saqd/zjcq4 S59rM0lri1SI+dn101JS3NC1YArvhunLm6M8ZfzFifkuZydl7bWDcaf2m5jVphW3mwPm KncEgy1vhIW/aye0oG/IcxgI1QpU7jlA6JMFBdapLkV2MzXTC6V7pY8/SSI/0aDkF8te lWysn6q4P+VnQd5YuDl3B2JJ1W37v97kXa0Mqcl3PZeiuC0W/29RNiaEb51ySzm8ndQ1 a6sWGpvYQaa06U5gPb0avQOlADmfbDehl7GFSrC/NiIp/PhGVyK4Uq8KXFjFob/13r7G kxJw== 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=WfWkeTMcL1Vb6jumsuguPcW/Ut2JbjwdzFnVv677Z0I=; b=IneIZrVHwzwUYLyS8lSkXi3w3LxHF0u1DTwIXI/tnlL9lVbS7ybCxNvTVRRKf9s2q5 5DG0jXeXLZpYK+K8C14yNoAYDA5QCa/mj+HPqTfbBjtYLy8P8n/jV2NW+mc1KYaQox8F uBA5Itj9CfO2eKVTukOFHMq0UdW84QEUwE61gTofVF+5Vbr7orQ5feEi7sySUHkFfEq3 piQelw3qtglV3t2jzXoUvn+TtBJu2zqwFqIhXmIotIKFSjHX5OGCrEXWr/UdShzcqK6o DA8MfEND53NPQCZ1dWr9oAxFzexIF+LROGGR7/glqzIPRC4eIE8yibYzAJ1QbpseZIfz +nMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kLUr3nm4; 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 r6si14832842jak.28.2021.04.05.02.09.05; Mon, 05 Apr 2021 02:09:17 -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=kLUr3nm4; 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 S237880AbhDEJHw (ORCPT + 99 others); Mon, 5 Apr 2021 05:07:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:50204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238656AbhDEJFx (ORCPT ); Mon, 5 Apr 2021 05:05:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 87EBA61002; Mon, 5 Apr 2021 09:05:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613546; bh=K5nbEc/DLrkYJWuKUU9FdNe9arkZubSvE6PlGSyjR4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kLUr3nm4NLcD6pnf5nzYNt1C8cpDLItmNNmVoLjVY9cV+ttuWJ/KqcaepZQa2ztl1 8aQY+wb7/ai0peYnXVS9Ulcx0LlMXIFQ21W3TVQTONjga61XwRRXXLxg/OPEFp7sCX dUr/klwMLdgvYyBK93LXUJ2NEOt3DEsBHJ/XEqhw= 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.4 52/74] drm/amdgpu: check alignment on CPU page for bo map Date: Mon, 5 Apr 2021 10:54:16 +0200 Message-Id: <20210405085026.432078790@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085024.703004126@linuxfoundation.org> References: <20210405085024.703004126@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 @@ -2123,8 +2123,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 */ @@ -2188,8 +2188,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 */