From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31921C31E40 for ; Tue, 6 Aug 2019 21:43:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE1392189E for ; Tue, 6 Aug 2019 21:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127827; bh=5ZvQzk9R5TI5bGpVv5L8Rn41Krgjr3O3/iejLxZa8a0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AMd5KjwS/3f3nlMa8VMg+wfPr30RvajIVJdYHrbOHejbmFHJthI25nuPRyxjMtyC/ gMmZbgQfBCRF7ZXv0wqVoVFrcMKeyeJ9+rc9QLdSQQH2m4iMvAqefOLNKLsK/rrNUI NWetqw+ZEWmuox9hvs7Zg3leY8t9bUzfjEY50Lwk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729183AbfHFVnp (ORCPT ); Tue, 6 Aug 2019 17:43:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:52196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727659AbfHFVeY (ORCPT ); Tue, 6 Aug 2019 17:34:24 -0400 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 25953216F4; Tue, 6 Aug 2019 21:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127264; bh=5ZvQzk9R5TI5bGpVv5L8Rn41Krgjr3O3/iejLxZa8a0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GOlXEax/8r6MqxapX+EGFiRhVcSaJRgPHWBzCQQ/hjK9n2SKnrTm4Trbiw1lBQsIe BQsS7LiQUgwQG0NR/W4xNQkaHetpzr2rOsa6u3QYszT8+iJTSBUov6foxXnf26TKUn x+FpUsANjEAnuua7Gd2N12nsTsED358APp02PnS4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wang Xiayang , Chunming Zhou , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 32/59] drm/amdgpu: fix a potential information leaking bug Date: Tue, 6 Aug 2019 17:32:52 -0400 Message-Id: <20190806213319.19203-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213319.19203-1-sashal@kernel.org> References: <20190806213319.19203-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wang Xiayang [ Upstream commit 929e571c04c285861e0bb049a396a2bdaea63282 ] Coccinelle reports a path that the array "data" is never initialized. The path skips the checks in the conditional branches when either of callback functions, read_wave_vgprs and read_wave_sgprs, is not registered. Later, the uninitialized "data" array is read in the while-loop below and passed to put_user(). Fix the path by allocating the array with kcalloc(). The patch is simplier than adding a fall-back branch that explicitly calls memset(data, 0, ...). Also it does not need the multiplication 1024*sizeof(*data) as the size parameter for memset() though there is no risk of integer overflow. Signed-off-by: Wang Xiayang Reviewed-by: Chunming Zhou Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c index 8930d66f22040..91bfb24f963e5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c @@ -703,7 +703,7 @@ static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, thread = (*pos & GENMASK_ULL(59, 52)) >> 52; bank = (*pos & GENMASK_ULL(61, 60)) >> 60; - data = kmalloc_array(1024, sizeof(*data), GFP_KERNEL); + data = kcalloc(1024, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 32/59] drm/amdgpu: fix a potential information leaking bug Date: Tue, 6 Aug 2019 17:32:52 -0400 Message-ID: <20190806213319.19203-32-sashal@kernel.org> References: <20190806213319.19203-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190806213319.19203-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Sasha Levin , Chunming Zhou , Wang Xiayang , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= List-Id: dri-devel@lists.freedesktop.org RnJvbTogV2FuZyBYaWF5YW5nIDx4eXdhbmcuc2p0dUBzanR1LmVkdS5jbj4KClsgVXBzdHJlYW0g Y29tbWl0IDkyOWU1NzFjMDRjMjg1ODYxZTBiYjA0OWEzOTZhMmJkYWVhNjMyODIgXQoKQ29jY2lu ZWxsZSByZXBvcnRzIGEgcGF0aCB0aGF0IHRoZSBhcnJheSAiZGF0YSIgaXMgbmV2ZXIgaW5pdGlh bGl6ZWQuClRoZSBwYXRoIHNraXBzIHRoZSBjaGVja3MgaW4gdGhlIGNvbmRpdGlvbmFsIGJyYW5j aGVzIHdoZW4gZWl0aGVyCm9mIGNhbGxiYWNrIGZ1bmN0aW9ucywgcmVhZF93YXZlX3ZncHJzIGFu ZCByZWFkX3dhdmVfc2dwcnMsIGlzIG5vdApyZWdpc3RlcmVkLiBMYXRlciwgdGhlIHVuaW5pdGlh bGl6ZWQgImRhdGEiIGFycmF5IGlzIHJlYWQKaW4gdGhlIHdoaWxlLWxvb3AgYmVsb3cgYW5kIHBh c3NlZCB0byBwdXRfdXNlcigpLgoKRml4IHRoZSBwYXRoIGJ5IGFsbG9jYXRpbmcgdGhlIGFycmF5 IHdpdGgga2NhbGxvYygpLgoKVGhlIHBhdGNoIGlzIHNpbXBsaWVyIHRoYW4gYWRkaW5nIGEgZmFs bC1iYWNrIGJyYW5jaCB0aGF0IGV4cGxpY2l0bHkKY2FsbHMgbWVtc2V0KGRhdGEsIDAsIC4uLiku IEFsc28gaXQgZG9lcyBub3QgbmVlZCB0aGUgbXVsdGlwbGljYXRpb24KMTAyNCpzaXplb2YoKmRh dGEpIGFzIHRoZSBzaXplIHBhcmFtZXRlciBmb3IgbWVtc2V0KCkgdGhvdWdoIHRoZXJlIGlzCm5v IHJpc2sgb2YgaW50ZWdlciBvdmVyZmxvdy4KClNpZ25lZC1vZmYtYnk6IFdhbmcgWGlheWFuZyA8 eHl3YW5nLnNqdHVAc2p0dS5lZHUuY24+ClJldmlld2VkLWJ5OiBDaHVubWluZyBaaG91IDxkYXZp ZDEuemhvdUBhbWQuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFu LmtvZW5pZ0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4IERldWNoZXIgPGFsZXhhbmRlci5k ZXVjaGVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxAa2VybmVs Lm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGVidWdmcy5jIHwg MiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RlYnVnZnMuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZWJ1Z2ZzLmMKaW5kZXggODkzMGQ2NmYy MjA0MC4uOTFiZmIyNGY5NjNlNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2RlYnVnZnMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfZGVidWdmcy5jCkBAIC03MDMsNyArNzAzLDcgQEAgc3RhdGljIHNzaXplX3QgYW1kZ3B1X2Rl YnVnZnNfZ3ByX3JlYWQoc3RydWN0IGZpbGUgKmYsIGNoYXIgX191c2VyICpidWYsCiAJdGhyZWFk ID0gKCpwb3MgJiBHRU5NQVNLX1VMTCg1OSwgNTIpKSA+PiA1MjsKIAliYW5rID0gKCpwb3MgJiBH RU5NQVNLX1VMTCg2MSwgNjApKSA+PiA2MDsKIAotCWRhdGEgPSBrbWFsbG9jX2FycmF5KDEwMjQs IHNpemVvZigqZGF0YSksIEdGUF9LRVJORUwpOworCWRhdGEgPSBrY2FsbG9jKDEwMjQsIHNpemVv ZigqZGF0YSksIEdGUF9LRVJORUwpOwogCWlmICghZGF0YSkKIAkJcmV0dXJuIC1FTk9NRU07CiAK LS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4