From patchwork Tue Nov 8 13:52:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9417469 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EF5B06022E for ; Tue, 8 Nov 2016 13:53:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E067921BED for ; Tue, 8 Nov 2016 13:53:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D562526861; Tue, 8 Nov 2016 13:53:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6F20521BED for ; Tue, 8 Nov 2016 13:53:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E9D96E535; Tue, 8 Nov 2016 13:52:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCD216E535 for ; Tue, 8 Nov 2016 13:52:57 +0000 (UTC) Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0M6mZQ-1d0Bap0Edg-00wSwK; Tue, 08 Nov 2016 14:52:51 +0100 From: Arnd Bergmann To: Alex Deucher Subject: [PATCH] drm/amdgpu/powerplay/smu7: fix unintialized data usage Date: Tue, 8 Nov 2016 14:52:18 +0100 Message-Id: <20161108135247.2030917-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:nxwOPiy0wICO1kioAfzZt4kvckS3q2fYMYXWOnuAW7rhrTv23bY S0fCoNKI8N3AbQtVJacVVz4tvsTDh6Mht2G/FzjaXqCTUO9/RHxC/JQ5QCtuMc8N8tgEcsO 67DIDrLcCqO6H89OW3gZ66Y+ahZnIjMhCLFoKSv6JGH3DvVZ62RUB3tvf9ZHbk9wUQyprGb Z967UvYRas8bkaRgCSB2w== X-UI-Out-Filterresults: notjunk:1; V01:K0:cIslYYPI1LQ=:xuihHGRh/XWJKGtCaX4zDi RY8T7pFkUXwVmjWMARGnuAq1br7KPWISpVr4nNsf/NBX1EsrFYy7zFTn29IkcmAhuM4WL2cWs BU838wESpHltertV7YeEtmy2F4BxqSpXR/dhJROwhZkOZi4NkUSCWlwA8Pw0gBZ5nU9XFU/sn weaLEn7XLLuiftZHvKxPFJP+JBAbjdMkmnLdcwKBshtoDnzr3VmiopSwv7jfSCo7/BjXnO6oa SNLNUdYdLgAdFWlvU8kMwFafszHUxbZPnTshQZuadHU2DLL2WTMpxLb4FWrRfWq3yGo4bRYHz j1VLUXMeeJT4lu1e22NYt4lmtDo0pVwsBt+PRaxEYCImhbcnIwHwKmabdEAUwok/OeMVEj27h 3yOFkszMARpsY8EyV0xsKmcmTqxqXMu3gQ6krc5sYhTlQ8ow5SX90KktKa6pCxg04GYwKv8S6 jbKSW/M5Y765ZTxAOTSoHgSeUqimd7VHAHtVGfvFf2FCqIE/vAgk1/pFG5cXMXMugO1YhKJUO 1kN6AJJcvHxnKtKmyyWzFauiOXEtcjaQ8QbvHSH0vyHnGK+mVPDEmIc3mfOOuAt1wCGmZiG3G ny8xL6OjcdAZzanREBPAWzmJVH7CjVphPDM38LvNFRyjidQuLXv3EC+oKdJGMCkRnhY2D5Sft ZNECCdkyFwFBJDXBEf78f8StQP39Kbok7pzBBpwUs/FIWBpJ/2rYPiVCEBx6Tv1LKWmc= Cc: Tom St Denis , Arnd Bergmann , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Rex Zhu , =?UTF-8?q?Christian=20K=C3=B6nig?= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP A recent bugfix replaced an out-of-bounds access with direct use of unintialized data: drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c: In function 'smu7_patch_limits_vddc': drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c:2033:6: error: 'vddc' may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c:2146:11: note: 'vddc' was declared here drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c:2033:6: error: 'vddci' may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c:2146:17: note: 'vddci' was declared here uint32_t vddc, vddci; This initializes the data as before using the correct type. Fixes: 77f7f71f5be1 ("drm/amdgpu/powerplay/smu7: fix static checker warning") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index 9e49f2777143..b2d61d043d52 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -2147,9 +2147,11 @@ static int smu7_patch_limits_vddc(struct pp_hwmgr *hwmgr, struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend); if (tab) { + vddc = tab->vddc; smu7_patch_ppt_v0_with_vdd_leakage(hwmgr, &vddc, &data->vddc_leakage); tab->vddc = vddc; + vddci = tab->vddci; smu7_patch_ppt_v0_with_vdd_leakage(hwmgr, &vddci, &data->vddci_leakage); tab->vddci = vddci;