Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp1599438imd; Sun, 4 Nov 2018 06:05:56 -0800 (PST) X-Google-Smtp-Source: AJdET5dtCWgQskrVR9gY/w7tfn1moq1bx2JIy0YUQLFf1RkQRPFZfGxKMUbtQ2FD88Q99YRO6TEl X-Received: by 2002:a62:8208:: with SMTP id w8-v6mr3810244pfd.150.1541340356408; Sun, 04 Nov 2018 06:05:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541340356; cv=none; d=google.com; s=arc-20160816; b=V/LrxoSQimJnbLBIFsrDHqkZL1Quc8Ap6B2n5T530UlrIk4LHXqxUxZGegkVxtCTT/ /FDt1ScO5HtWy/fPtj/KnIsL4HaZUV5MqvXNDYcaRrfhzeVJclAUPKvAq+GZqEruxksL cxj3ozZ/7IHRH2203nAc8Dpcp8tPniYeFjveGXpf28GelIouGVozOYMvGCfyATcidJJ/ fmhs1gE161nRqiX9yp7UFQESuXChv9kFoFFRMrEZctDy63hVlXLxf3Sjd+uwL7Zok0UU BHdZPGeYkNg8JvxeEdTRgVrlkfH8QjYW23ArX31wCWQWdtd9whHzoXnCQPmwg2HIjLxV dOkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Fo3C3ywu2nzEGzoblkO7IlHiFB7P8B29DoRj8dBiIB8=; b=EaZoJBjtFcPzG3TjJ+wcHu1h4UyTRw0Q06R8oG+Ycf+bmGJNTzplS2cuiQMcwMAwbj 0VTIZZ7DRUZwA5/Rs6XaJgMqQh6FfGKhyDjMkOp5GuZeGEHNe7TnJMMBxMx0ovPXWSjC VTC7o3geHfzlTF9VJyqA8vwl8ZfckXcAIkdbQKkbk/Fm0yzLIPZ21ZpTLFqW0d3Ew6+I v0PQyYBOMYyHthUyVVv0pNV7vBlts7MgWSYZOJMOHyL/P7js7lq8dH9nAjQxc3SXmcXP gKaMXY+eZiwJcrkk4eyBq4kOeO7xiK5YEPuFW7RieV10bmJ7TEbJhjlnw6NFTzJWJ+0w jA8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="pk/Pk74H"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u10-v6si40982164pgg.180.2018.11.04.06.05.41; Sun, 04 Nov 2018 06:05:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="pk/Pk74H"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730922AbeKDXT6 (ORCPT + 99 others); Sun, 4 Nov 2018 18:19:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:45812 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730456AbeKDXHn (ORCPT ); Sun, 4 Nov 2018 18:07:43 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 468F62082E; Sun, 4 Nov 2018 13:52:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541339558; bh=DVOqA5WRc/zHJeSM5KhVyYGdAl/ooRom5MjT0mS6FCU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pk/Pk74HqrHR1G5spT/nPOaPmUU1A4c6l/OWDkjW5S2i/KQj0BmRxA5S0zJiFJROi N/3zrngbVy+5KVxtYFa7kLeF3zKZCEwRna7Zp3C0sRDSvVE9OLaLwGure1jJzssYyT HxfsuIbNSY3P2Bg2nMTA4vXRHGuHRvzFN1yWbduI= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dan Carpenter , Huang Rui , Alex Deucher , Sasha Levin Subject: [PATCH AUTOSEL 4.19 56/57] drm/amdgpu: fix integer overflow test in amdgpu_bo_list_create() Date: Sun, 4 Nov 2018 08:51:43 -0500 Message-Id: <20181104135144.88324-56-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181104135144.88324-1-sashal@kernel.org> References: <20181104135144.88324-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit ff30e9e8509cb877dc7cbc776b36c70f5bdd290f ] We accidentally left out the size of the amdgpu_bo_list struct. It could lead to memory corruption on 32 bit systems. You'd have to pick the absolute maximum and set "num_entries == 59652323" then size would wrap to 16 bytes. Fixes: 920990cb080a ("drm/amdgpu: allocate the bo_list array after the list") Signed-off-by: Dan Carpenter Reviewed-by: Huang Rui Reviewed-by: Bas Nieuwenhuizen Signed-off-by: Huang Rui Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c index d472a2c8399f..b80243d3972e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c @@ -67,7 +67,8 @@ int amdgpu_bo_list_create(struct amdgpu_device *adev, struct drm_file *filp, unsigned i; int r; - if (num_entries > SIZE_MAX / sizeof(struct amdgpu_bo_list_entry)) + if (num_entries > (SIZE_MAX - sizeof(struct amdgpu_bo_list)) + / sizeof(struct amdgpu_bo_list_entry)) return -EINVAL; size = sizeof(struct amdgpu_bo_list); -- 2.17.1