From patchwork Tue Apr 11 13:42:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13207594 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BEEA8C77B6F for ; Tue, 11 Apr 2023 13:42:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C57DD10E318; Tue, 11 Apr 2023 13:42:32 +0000 (UTC) X-Greylist: delayed 311 seconds by postgrey-1.36 at gabe; Tue, 11 Apr 2023 13:42:30 UTC Received: from mout.web.de (mout.web.de [212.227.15.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 06EB110E2F5; Tue, 11 Apr 2023 13:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681220529; i=markus.elfring@web.de; bh=MdVoBfc/dINhWnEEIR/uciIViBWA6WiKvA2ZgQLTO6U=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=LJvC47Keh162g60XJxLk25jMiGsplj3uqBrXyV0WKxPlF5qGl+XdM7ARKYR5L71JE 1b9sMiQ65irha7oV82FWxVd4SzME7q8Whi317lDv4PnsOw1kXFpGuEW4nErDoDKXwh srg2XlbsAsWku69qqHL86adLV4o4uCHza6M8I5TdHSA812He42XG5StoVU8k/9s3hl Czk1Swjq4qpPdFy1emDuRxtwyt5sLqD2W3ID4nex/yAb4gvSSaHzxvLU6UPzyScouf fC28gyJvIjIpvem0ns93BHSZbbX0py8Nn5TECeaFfKbqUtsryNqEB4kp+smxkEyNS0 SdPkXCb0MBGSA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.80.83]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MidHP-1qGMD93cff-00fjHF; Tue, 11 Apr 2023 15:42:09 +0200 Message-ID: <0d4b92ab-f7c2-4f18-f3c3-c0f82ba47fc8@web.de> Date: Tue, 11 Apr 2023 15:42:07 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: [PATCH 1/5] drm/amdgpu: Move a variable assignment behind a null pointer check in amdgpu_ras_interrupt_dispatch() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alan Liu , Alex Deucher , Alex Hung , Alexey Kodanev , Aurabindo Pillai , Bhanuprakash Modem , Candice Li , Charlene Liu , =?utf-8?q?Christian_K=C3=B6nig?= , Daniel Vetter , David Airlie , David Tadokoro , Eryk Brol , Greg Kroah-Hartman , Hamza Mahfooz , Harry Wentland , Hawking Zhang , hersen wu , Jiapeng Chong , Jun Lei , Leo Li , Mikita Lipski , Rodrigo Siqueira , Stanley Yang , Tao Zhou , Tom Rix , Victor Zhao , Wayne Lin , Wenjing Liu , Xinhui Pan , YiPeng Chai , Zhan Liu References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> In-Reply-To: <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> X-Provags-ID: V03:K1:25febEqWetoQFrH/VBrwzBfTZugoK4sRWe5E4/QkInoeM7mmYZD TAwrXHKHDI9pkIADa8o8P5ZXEeWc53/5VA2ElTgbNWnpDUpzd8KvpK80DhfwPvGN6e/Ecpa L9+Oy8j2pqZgtAhQTdDKZu2mzIKAq5DryqasE9YtyWkeT+b93vSX8KPc6BszT3hKXYoZxt3 YG8zPMqts/i/f6BWFEEog== UI-OutboundReport: notjunk:1;M01:P0:rk04CgmiAgM=;BjHW4/lmZCg4/XhetZVbD0uiU/7 6xo7boTMuwYxpNVQsDmg37k+mhVfwgK5T6tbTthJjc0R7/TjZokWwAWgzkefPt3epO9/9BFOz pq6Toe1LfbPOPTR9QwrFxd7tRD+hBXGelxeor5euggerPKgvKDOZIBEGgN/ZsnNRVvnN6LxpM GCvhcL6GPK+D/uNk7iv+5wMnPH1IflQ+A3xOz15LXHDSAC7uQ/isKCWKST1PvUnkptJSrzw7u jgZxR3QI2WA58N4n/5HSx7zdm3lF5f8/5Zwg5BL+PW8b98YV0PrnNoTAp441+7ML71OpHpMOR lnaUfJx+yl0S70j42GgynhWHDdDtkut9hqIRZMa0oXvKQFN0mIc0xs6ZSY3Gg1LwiZ7WZPrvm LAIGAk89jrFoT6UdclsdWvyBgCdAdJX9f7uZQaABpBAROIiGBdtLcBx3SVtMwtm7wDStJSO4O BdkDzyZv3GgsCH3+73vMXdZW3nkrcfkC6dL9ptxhozWkd5NB6JR9X4CmOILZHMuP3UHzqoe2b +pcCtRRz5/g6lUxZ//771PTzwsKgYdzMs8tZG1Zmi97T9BfjeJzYMepSU21RFXrmXC+VZUpD7 MJooViMRuqTey1bP3pfiM6KcMcR9HEx7Wz9IGQyCN5J3rG50x4/+68j7rtPepA04tNUdW9Pi3 nuzTspL78ixzLw785rGRZ6TvI3Neu8IqHNPznd3h43PSjN6EcN6kxkUKivkYvEOCfjvr+Nby8 QMyPvW1rypdAYWpla7LvgjIbatJJwbm73kwgrB6LtPB7qTZ752KgSTWM3jnb6abcl3VwatFsu b/C5xu/WxV6e7ectsHQj2L/ZU7i92GUREA0WKGNCBB6DFdX8U9kaLRspS4rmDfME6lKPGHvgO PpOl9b+2/01y1F71kTEcQDT5NcZ4755N8bC96sTBRKI/EWyg7aza/YCEk X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LKML , cocci@inria.fr Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Date: Tue, 11 Apr 2023 10:52:48 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “amdgpu_ras_interrupt_dispatch”. Thus avoid the risk for undefined behaviour by moving the assignment for the variable “data” behind the null pointer check. This issue was detected by using the Coccinelle software. Fixes: c030f2e4166c3f5597c7e7a70bcd9ab383695de4 ("drm/amdgpu: add amdgpu_ras.c to support ras (v2)") Signed-off-by: Markus Elfring --- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.40.0 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 4069bce9479f..a920c7888d07 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1730,11 +1730,12 @@ int amdgpu_ras_interrupt_dispatch(struct amdgpu_device *adev, struct ras_dispatch_if *info) { struct ras_manager *obj = amdgpu_ras_find_obj(adev, &info->head); - struct ras_ih_data *data = &obj->ih_data; + struct ras_ih_data *data; if (!obj) return -EINVAL; + data = &obj->ih_data; if (data->inuse == 0) return 0; From patchwork Tue Apr 11 13:43:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13207596 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 868AAC76196 for ; Tue, 11 Apr 2023 13:44:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B0F6010E4ED; Tue, 11 Apr 2023 13:44:08 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.4]) by gabe.freedesktop.org (Postfix) with ESMTPS id D936B10E36D; Tue, 11 Apr 2023 13:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681220630; i=markus.elfring@web.de; bh=7QMVGNLkemqceAqBuvWC+EimKfuSgO/00Je536TRm9Y=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=TNbeE3ytFDGYp1ad5equCMWRYcyu6KB2oYURomUJlIoPZoIO/KN54tb1SfxL6BqLq l/AYUVrEa6hBQj3RMMMQOF4qj+r7j/hhvQYR1N25TWaPMIijjfzu5RR3nHG1bsW8C5 e90IUwjLq+nj2ijxljzvKl11s0DtzqOV6y8KIUuumr0nI343XLaxhtW38s+7OOw5tB /5GjVvG5EwZXQoo+2YkYUtpF5yle1KUrAYmeYrM2EEV3G+afwxwAiW5NbS9BeWmRkC uj+vGn/63pZiLlAhwkoVsYCsOwXZZMmWZdWSZtXeAEcFpcF2yrSw1D6UhthD/m0XMg ZbPGuyVtmkgJQ== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.80.83]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MC0PR-1peE4x0VmH-00CVOk; Tue, 11 Apr 2023 15:43:50 +0200 Message-ID: <89048a5f-2dbb-012c-41f5-7c300e8415f5@web.de> Date: Tue, 11 Apr 2023 15:43:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: [PATCH 2/5] drm/amd/display: Move three variable assignments behind condition checks in trigger_hotplug() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alan Liu , Alex Deucher , Alex Hung , Alexey Kodanev , Aurabindo Pillai , Bhanuprakash Modem , Candice Li , Charlene Liu , =?utf-8?q?Christian_K=C3=B6nig?= , Daniel Vetter , David Airlie , David Tadokoro , Eryk Brol , Greg Kroah-Hartman , Hamza Mahfooz , Harry Wentland , Hawking Zhang , hersen wu , Jiapeng Chong , Jun Lei , Leo Li , Mikita Lipski , Rodrigo Siqueira , Stanley Yang , Tao Zhou , Tom Rix , Victor Zhao , Wayne Lin , Wenjing Liu , Xinhui Pan , YiPeng Chai , Zhan Liu References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> In-Reply-To: <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> X-Provags-ID: V03:K1:PqPz95aENc2yY4ywu1s1GTinq81kvAZt6m4fTsE0rOeI88+DpZU h65mIHIHhsh1du5/3FvC1i+ZotOzl1F8SpGJu+FuqahoYLTdb3RXneyQLNSpRbcUL3U0tC2 Zmaa4JSg35REbB3IqmGjTNAATjBYHPmvG7mASbc8cdbNoecMOBRRBsQT3gLNEa0JoYyuLD0 MPKJ2lk12ufmrxTcHgRyg== UI-OutboundReport: notjunk:1;M01:P0:Qx+AswJDC80=;EGkA7B18JdiviSfPLVea3rozgG2 2RIVxfybNO+4m31FcnHVIKyDa6rnqKNDmiVXxPLqQZU0h1y5rjWx444VRFYoob46lhh+b5a20 +54IS/teRxhSvI09Ng1nHqycTcPBns9oY2+U0JLH/Fqwys8GDA1LmnmfCQLJKz/MyzNAECerx 6qDoKWwIBNGVRC4YVZcHvRlhAvy5lr+wP0bOTe/eWnTDV+qnTcsTal4F1cEzgWfjtzaYAkP+X zQc99Bbe2NXv1LhO9LigMQFD04QNQkDbxT1TsofT9u0pDvMI11U5hOTIAacm7FmT5uy3hSaaG /angXBm+xe3EFcdYfrF89xEVyJJ3mm8btP39hNv+Z5hvuoRI0cSvIIDC2j6e1GQTkaYgxer5j 8D2YOcMTdOeqRRW3LieuaeCxz5Nwtv1ZlIs4qjSXabTO7g0lfxvIL7e06df8t18VjahTY2kVZ A7yNXFUe6Tj3XXM4nsAjmKZPJzUQhmsmUzS4aFHDQihKewLLKB9SeCXDZD1NvEOiae16tjlRz 16iWbNm8daZ+vOIIP96hapZAMvjLh1pRw/8NYEOEjwZXSIqkDL2t4Xu13XQToY3+96bPCec1U NKo8BFcMeqSo4Cn4GALJVNMMHHE+G2XZnNKM33besDS5YpqwuHit+plx3H49KR8kE0waj8nSi QNQOD/BQ9TciNiAA2twZA2ucsqd08loqZ/I/8gfLP/9nJPLVkB0zwqENECpfk2TJdgl56TEKL +5+r6QFKBsQjccf+AtZMaF6hOuwx/7h7j9kS0z6fpHfvatcnPUsKJId3cIBMJRWjrUfDWhjSP 27ZBHWFkZ8OK+6xjSIqsMvXcUwGaGoYMDeeYf39PmTuyl+PdLhGraKP+WHY0p3YT++Z6Nla6y 0stSTVLGh5Fb2ZJGH1SzasRGut01NgMIqsk0ZGgD+XDtLBFZpPAX36YfK X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LKML , cocci@inria.fr Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Date: Tue, 11 Apr 2023 11:39:02 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “trigger_hotplug”. Thus avoid the risk for undefined behaviour by moving the assignment for three local variables behind some condition checks. This issue was detected by using the Coccinelle software. Fixes: 6f77b2ac628073f647041a92b36c824ae3aef16e ("drm/amd/display: Add connector HPD trigger debugfs entry") Signed-off-by: Markus Elfring --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.40.0 diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c index 827fcb4fb3b3..b3cfd7dfbb28 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c @@ -1205,10 +1205,10 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, size_t size, loff_t *pos) { struct amdgpu_dm_connector *aconnector = file_inode(f)->i_private; - struct drm_connector *connector = &aconnector->base; + struct drm_connector *connector; struct dc_link *link = NULL; - struct drm_device *dev = connector->dev; - struct amdgpu_device *adev = drm_to_adev(dev); + struct drm_device *dev; + struct amdgpu_device *adev; enum dc_connection_type new_connection_type = dc_connection_none; char *wr_buf = NULL; uint32_t wr_buf_size = 42; @@ -1253,12 +1253,16 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, return -EINVAL; } + connector = &aconnector->base; + dev = connector->dev; + if (param[0] == 1) { if (!dc_link_detect_connection_type(aconnector->dc_link, &new_connection_type) && new_connection_type != dc_connection_none) goto unlock; + adev = drm_to_adev(dev); mutex_lock(&adev->dm.dc_lock); ret = dc_link_detect(aconnector->dc_link, DETECT_REASON_HPD); mutex_unlock(&adev->dm.dc_lock); From patchwork Tue Apr 11 13:46:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13207602 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 16384C77B70 for ; Tue, 11 Apr 2023 13:46:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 557BE10E36D; Tue, 11 Apr 2023 13:46:26 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 622E010E36D; Tue, 11 Apr 2023 13:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681220763; i=markus.elfring@web.de; bh=UmXfEwjkGD/rVmjQKSe4E0UbAXydT0j9qkxZgnZJ+3w=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=aeAjcezU9SpnI86W3rEWETjVghG+BUjtoGlGqRk+XUJjj32Vw+vNkw1fIN+m08MKs a/nxNwFPXPhPHuN9WBcaFOtMnKTX1MK8JQchLG2Bg9qiM8H6KFC1vtwflq5oW97K3M wl18fx95/GSiF13PiMaFouZc58Kd+b0WGVguoygDPyKVowAXN3SiY0CTml1mAi3AhP WtVIeXNceToEBFy3SNXT5gLLwbHWmLeGQ6PG9k/duQk6KRv41SrWv0WL0idfPCZDHV +mzfEIsUsK8/v5Iuy5QejsE2F9ad2yNgGoU7eg68F0v6f5DOlc2pu77SpktzDYmm0c OPhO5wIQX1BhA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.80.83]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MyvB8-1qZGSv1rbG-00w6KT; Tue, 11 Apr 2023 15:46:03 +0200 Message-ID: Date: Tue, 11 Apr 2023 15:46:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: [PATCH 3/5] drm/amd/display: Delete three unnecessary variable initialisations in trigger_hotplug() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alan Liu , Alex Deucher , Alex Hung , Alexey Kodanev , Aurabindo Pillai , Bhanuprakash Modem , Candice Li , Charlene Liu , =?utf-8?q?Christian_K=C3=B6nig?= , Daniel Vetter , David Airlie , David Tadokoro , Eryk Brol , Greg Kroah-Hartman , Hamza Mahfooz , Harry Wentland , Hawking Zhang , hersen wu , Jiapeng Chong , Jun Lei , Leo Li , Mikita Lipski , Rodrigo Siqueira , Stanley Yang , Tao Zhou , Tom Rix , Victor Zhao , Wayne Lin , Wenjing Liu , Xinhui Pan , YiPeng Chai , Zhan Liu References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> In-Reply-To: <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> X-Provags-ID: V03:K1:mfR682QWIB15jomI2vo/3Z1VdYVfDYwQO9OXdo8EDMvcQgHyx/z eApczEwxVZzgBSCmh8Kd+M3yBz0dM3Cy4eyNfHIt+qTBdmkMBXeQ/l3SnK8lqi6qi9M5tQU IYcdOGnmHCPbUwv1U3z7dUYG6dmGviiViwLoln1Y+kjVFkUC0mNG/Nd966zNnZLDvXzVAdA y5+Rvy7tcuUBSHX9uGJKg== UI-OutboundReport: notjunk:1;M01:P0:vqGhnX+j9qg=;kwMl01xOIqacGYDb9vukb2sItW/ BwIc6yyMLzSg3cNKYYBo1FzmmVyo6rq8Hx4X2CFaHIkTR56hoe3Stf57DsoRPQEjZ2UoWzsyg +RPcZrRJiwbzsUrBu91HYD2FsGqueE8XCBfO8a4MG7DFy4p3rP2Q5ROsPdUb4WFJsyxRYHxm1 UdL+YxwSjlqFP6IChVsjC5+NIQyvfG7yvkHr21Z+9zlRe/bttCtqqfW9QgMPcZJVsp9GLtzZN dwIMQ2MhhaYQk3E3VNFS86AAIirSRTpokn+26d8JALNhZjWi3G3OFNsSMZMrckycbgYDa31ue pjJfcPIvHk+xs0MS2IDcaKdDax0tWA5ukUuphTd8N8uyhF4zW14/Tb5Y87CDt2too1XfeX6p4 pe/t4J9/hAESsmvwKAUKnz8ihmejoowIFnFABy+hng6Pwvf4/bh+TgV69zhQwDOesA/oRjEs3 6mXnu7CS2xkILAfgMxh48FajfgumjTszZoDlHoxlz0vAc/OD5YrMhFUy8lMp4mhfz6Q73Qzje Hf701mWB7Ef0f+vM6j3vMnB4CX16gHWbpIA9Jgw28tKhk58dLSRfq3AlyR8+jyqbFQxWtT77f CZlabKfhQWPxG23OVqz3q3iCtJEk5G/ixyj0wu5D5S3NDSRiuF7gbLwQRgPOdyZ2A4Py6IzHE 96LVah1CZBcXnEe5Ej7MHLk1SwIl+AAEku8EoY0atRwcLC0q2e9ebSz2EFGo/lm7HFDCgBiOk /qVPBmQ+tuhNtnD03ByH8EWBiZcuDXYwXFhkvTwApoqJDRwpikexbaDsuH4N4uPAZY0VeEWcM 2LDqMMUOKTMDdVKQc1MIA9HveKcwHVFWvvmYXNdc4ZlEmB8NTZoW99KRhCyIk/AaDVJRk/PKY SjMJuxwsYsnVrmDNoreDa7y9jn2gxs8cZJo2Q5WEpOK+MJs/4S1aRAEab X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LKML , cocci@inria.fr Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Date: Tue, 11 Apr 2023 12:34:42 +0200 The variables “link”, “wr_buf” and “ret” will eventually be set to appropriate values a bit later. Thus omit the explicit initialisation at the beginning. Signed-off-by: Markus Elfring --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.40.0 diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c index b3cfd7dfbb28..a37d23a13d7b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c @@ -1206,16 +1206,16 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, { struct amdgpu_dm_connector *aconnector = file_inode(f)->i_private; struct drm_connector *connector; - struct dc_link *link = NULL; + struct dc_link *link; struct drm_device *dev; struct amdgpu_device *adev; enum dc_connection_type new_connection_type = dc_connection_none; - char *wr_buf = NULL; + char *wr_buf; uint32_t wr_buf_size = 42; int max_param_num = 1; long param[1] = {0}; uint8_t param_nums = 0; - bool ret = false; + bool ret; if (!aconnector || !aconnector->dc_link) return -EINVAL; From patchwork Tue Apr 11 13:48:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13207603 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B957FC76196 for ; Tue, 11 Apr 2023 13:48:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A343610E536; Tue, 11 Apr 2023 13:48:44 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C66610E536; Tue, 11 Apr 2023 13:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681220909; i=markus.elfring@web.de; bh=PmartcUcUfUvHCefd8IJ+WPgBwHOSel2Zds0LKRahh4=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=nrVQQa9ygHmJ/UTngS9Q+NhPtrZjxolEMDWtgwbBekoz+YGIiacMtU7RJ/LHhZTUD rcDD6Hzb+hOzDiWZCDBMtv/KWa73OeK//KPLPeGLhReyNrUNiEg0zR98N9BGai7OVf t3wXerofMNlLalhYNDijRHj+UWf8rTpw8zvsoQI38RuHMUIkkcs0LFvbqmrtbweuz9 ALsCyQbRvaqbdChOM6aCQ1l2DxCh9TkDu12TH7wHeqpVP73xJt96Zuj9oIh2BQxfox KcXvsIerSHZPILuF6ghFjZnhS20XMxFu1OayLE/hAMpP3iahCKRPKbAP6lHtaVYHwI B2xa4j1XvPAKw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.80.83]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MWi5s-1pskkP0uhk-00X2oX; Tue, 11 Apr 2023 15:48:29 +0200 Message-ID: Date: Tue, 11 Apr 2023 15:48:27 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: [PATCH 4/5] drm/amd/display: Delete a redundant statement in trigger_hotplug() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alan Liu , Alex Deucher , Alex Hung , Alexey Kodanev , Aurabindo Pillai , Bhanuprakash Modem , Candice Li , Charlene Liu , =?utf-8?q?Christian_K=C3=B6nig?= , Daniel Vetter , David Airlie , David Tadokoro , Eryk Brol , Greg Kroah-Hartman , Hamza Mahfooz , Harry Wentland , Hawking Zhang , hersen wu , Jiapeng Chong , Jun Lei , Leo Li , Mikita Lipski , Rodrigo Siqueira , Stanley Yang , Tao Zhou , Tom Rix , Victor Zhao , Wayne Lin , Wenjing Liu , Xinhui Pan , YiPeng Chai , Zhan Liu References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> In-Reply-To: <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> X-Provags-ID: V03:K1:OjNaTpA6rVU38fiTJC0fNNG2t5tB53sqqQBlbcCU5z3ROHPDvcj T2gqQXeh8yKLTB4ZZgIdo37z2QE9Bu5ylSF4QIGa0tHspLI264JEP5rudggzyB+U+TjbEfW zi/siiBDU2A1X16WR39Av+5hKyI6irY6syLjtUH2HOIP+UU3FzGZ4tgGJTi9x3yo65L0s3S yunPLxXOdRyQzStwxTyIg== UI-OutboundReport: notjunk:1;M01:P0:7EabMdF49OI=;x9HznEdNHgVb/jUMFKku/XplEHV xT0XNK29XjKB1UDQ3hGxZ+JoLOhxjVL3VZK2wpb23SJaynAIAyB4utT7Du+0Durlf0cQM3a98 bhLNqFrRg16PUADKH6PsG0H4gsDl2dDJeEdB5uGjfO35c55Yuwg0mdJ38g8pL+inZL0MkIQFl vh3HReLxJ/T5THBM4g1hMQ3OygjIZoZpZyVl9m1PkRyqw8KAED8HeXOTkOInAySM4A4f+Ej4b xTBwQLETNnsjMrwJNY0uTZF27D+cx2tCDRUWUaCc47+GuRcdC9noRXQk0EuM9jjuGvtqcB2ZO pRgV7plHQsGa0uvA3yYB9n/9RDFRm3dCTVgsJx99C6+3Qwvlz35gUKaJGfEz2+MxCvq0JnAYO cRGyP6qW/SXr7aRkQf3ullLO3rmQfboqy3bLbsoS4NLPPkY+pPUnLXJSpASa2fCgQgD/8ieHh rSnHM4rIeKwXSmGUI03sLTUgB05VQZ+m27SSR4UnDaIRMHcDa37iBwFfW7nn3uDLkRk7dHkqF IPbRodhPIaJN+9ScxT5Ebua2SXIv5vHnSYXp5XlVIHC8jdGq8I2zOB7H7j6QB1N0uAvp/CbFH js7q1LOoOv4O/VlT1pkh2bY/AVUTsEC4LMus/fadO2ZangeoXpiUGwJWjiMrGfHaUFdzcL0bH AjJfhwZ/fXWhWDH7fxxUgKiyiYZbSSX54NW+PJxf14Jwxl/SWlvwhXiBCgML1ajirOWON5SjK +gM32NaEXy+6Q2eTraOO2js2kTrq19pAPhae3ulbe2v5llno09GLPg9FmVEoznUfplXb4mIPC xWq2UOIj3/2G5+my4hZeBfCLCQzxnlLXt/HQaql9E/1sTRTmEXwmF6tiBcHhUOFHtrIfye+1H CC4E3E5IlJn8FL9NG+WpYfOYzVYkw9cmBFcxqczKMIh4KwBpK5VTLsDdJ X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LKML , cocci@inria.fr Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Date: Tue, 11 Apr 2023 13:26:35 +0200 An immediate return is performed by this function after a null pointer was detected for the member “dc_link” in the data structure “amdgpu_dm_connector”. This check was repeated within one if branch. Thus omit such a redundant statement. Signed-off-by: Markus Elfring --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 3 --- 1 file changed, 3 deletions(-) -- 2.40.0 Am 11.04.23 um 15:36 schrieb Markus Elfring: > Date: Tue, 11 Apr 2023 14:36:36 +0200 > > Some update suggestions were taken into account > from static source code analysis. > > Markus Elfring (5) > amdgpu: Move a variable assignment behind a null pointer check in amdgpu_ras_interrupt_dispatch() > display: Move three variable assignments behind condition checks in trigger_hotplug() > display: Delete three unnecessary variable initialisations in trigger_hotplug() > display: Delete a redundant statement in trigger_hotplug() > display: Move an expression into a return statement in dcn201_link_encoder_create() > > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 ++- > .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 19 ++++++++++--------- > .../amd/display/dc/dcn201/dcn201_resource.c | 4 +--- > 3 files changed, 13 insertions(+), 13 deletions(-) > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c index a37d23a13d7b..4805a482dc49 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c @@ -1278,9 +1278,6 @@ static ssize_t trigger_hotplug(struct file *f, const char __user *buf, drm_kms_helper_connector_hotplug_event(connector); } else if (param[0] == 0) { - if (!aconnector->dc_link) - goto unlock; - link = aconnector->dc_link; if (link->local_sink) { From patchwork Tue Apr 11 13:50:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13207609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8C660C77B6F for ; Tue, 11 Apr 2023 13:50:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D351110E245; Tue, 11 Apr 2023 13:50:33 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77D1810E245; Tue, 11 Apr 2023 13:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681221015; i=markus.elfring@web.de; bh=QqBrh1iOG7Q4T2t0pkmEGvdBD1d8O9i9GYWCZGAT47g=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=K6zzEBWXsxSPB8XPajfrExmE1NNHZ4KP6iVFmus2wBQ0rmBPTYdrSxaYi4RfKihpT rzCLvMmAorDLVby9zT5RYHOE+dSSyqgk9LrId8SMeFeYMjQlhP573CDN3INoyyIZj6 u0R37cj2oLma2/CrLudYSsPsvyaA+4fYB8MuFG6jhjgm8VNNRU9ATuCMjzzPyr7jk/ Uyi9s2X3+kBQRXeeqhwqkCLipnTZTofM3CQrpxeKcOlIgrrORwxS2pjEA950Fi2UcP p1gnJruNKzQVT4jBK0pofhiBjYpJiDf9FGEIu3/9kP6oyyR+38Eub90LFSZJfat+D3 WQl7n6Wl9t43Q== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.80.83]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1Ml4B6-1qDpud2ScO-00ld3e; Tue, 11 Apr 2023 15:50:15 +0200 Message-ID: <5341f677-4192-3c17-fb76-faddcf5ac9a1@web.de> Date: Tue, 11 Apr 2023 15:50:14 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: [PATCH 5/5] drm/amd/display: Move an expression into a return statement in dcn201_link_encoder_create() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alan Liu , Alex Deucher , Alex Hung , Alexey Kodanev , Aurabindo Pillai , Bhanuprakash Modem , Candice Li , Charlene Liu , =?utf-8?q?Christian_K=C3=B6nig?= , Daniel Vetter , David Airlie , David Tadokoro , Eryk Brol , Greg Kroah-Hartman , Hamza Mahfooz , Harry Wentland , Hawking Zhang , hersen wu , Jiapeng Chong , Jun Lei , Leo Li , Mikita Lipski , Rodrigo Siqueira , Stanley Yang , Tao Zhou , Tom Rix , Victor Zhao , Wayne Lin , Wenjing Liu , Xinhui Pan , YiPeng Chai , Zhan Liu References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> In-Reply-To: <2258ce64-2a14-6778-8319-b342b06a1f33@web.de> X-Provags-ID: V03:K1:k4el8X+ATWGE1XAQw5UGkyMRjJ5All74JHlKkerIl79dJWrOxCn 7GN2s7L3Bvap3zkoSW9jkSUD0g6BSw0Sa4NTWMnH5XbYYHjAIJCwwnbFL+XV9YqjBwygSjh mNWO47vTH33VRRqJkPvREbx3aMRa1p9BjYk8Y6QhmznUv/ILmPjx15aeWJGkUxGPKZ1Tygh DNk3+P8IesUjo0hDhbIgA== UI-OutboundReport: notjunk:1;M01:P0:mnPqPBJJIHA=;7vxqSL+DR2zreZ5Xn4j6gBqu/AK DMOoX/QPTVG+hJiJmivXNmZuT8zEItsJcIjU3IiSZ1OM9mJOxXM9EhQXsW7ToYgeq9oU1KBW4 mTOf5gV64BQDYYsaZ9GLoHYnuPKAJIETUJqLuuQFHe1vgm4sy5aSr5X5WTorUsZC8FI4D41yy DeaO3JSlhp5N9oZJ4f+qq6XErgTAQ3DlSBmc3BeVPeFs0WhzfZ+Fpe31XddgK8ewSvbguV2NH 4XCG3I1FJzfEFPjzxwHFq0oAjLZEKr44/8A8VHW6yFqxYLD2vZWXRPo2KVhgTwpeeJOR9FvFf wcW2pbE+cxi0+QvU09wAUS+Zx2SKoHDfmVqw03//OF1CxDaDMozyKWAt93Yy2NsTzTgF5z1S0 jZlN1dKaXYSgqvTXtEWFBF3s4eyZ8Al9jbSxcIwveD7uNUCilQ68TQ7jbX1MV/R55OloxjtNr 4QoUDBVzwOuiqrKCyU61wPz5Kxhg2gActZ+5pzRmWQrKTTd6iTz1+rD9hMJeVTWTo6mjaVKqx 0tikWwuKjlmWiV8nRmtFOOXIE0yeRLrZXOQg1r+7h+InOsXw1YF3HjorVds/gxW2QGcMPOZxw A5afSj5swu+5Fg9CURpmoZFx9oFxNEroxfPyYXINzroxnsbQ3mHApGf3jvJFpWa5SjEPb4EV2 7pCYdbDDpP/KxCJ0NKakpIWFkL+KcplkMzeceZG6ycQ3ICAQTGJHCo1soKR4C3KnxYceH8T5v hlYXvrk1Txpw3sLOrufAO2Qu4KMOlm5ExH4og/tMjPOW/PzsXT/atRzXtqcrp6YaOurkaRsfk HMEsRaEw+UPmHeLIBtv85qV0VExXp6iftOtHL8mxijJYoW0BtqGURRsv5SxMdzWuTY8Yls1mj nipN0UQBsh3CW+SyCVU1h6tIhyKN7oXfAUv1awug4DRDnAw1VH+jmOVRs X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LKML , cocci@inria.fr Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Date: Tue, 11 Apr 2023 14:04:57 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “dcn201_link_encoder_create”. Thus avoid the risk for undefined behaviour by moving the usage of an expression into a return statement. This issue was detected by using the Coccinelle software. Fixes: 3f68c01be9a2227de1e190317fe34a6fb835a094 ("drm/amd/display: add cyan_skillfish display support") Signed-off-by: Markus Elfring --- drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.40.0 diff --git a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c b/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c index 6ea70da28aaa..a1b44c7bd34b 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn201/dcn201_resource.c @@ -791,7 +791,6 @@ static struct link_encoder *dcn201_link_encoder_create( { struct dcn20_link_encoder *enc20 = kzalloc(sizeof(struct dcn20_link_encoder), GFP_ATOMIC); - struct dcn10_link_encoder *enc10 = &enc20->enc10; if (!enc20) return NULL; @@ -804,8 +803,7 @@ static struct link_encoder *dcn201_link_encoder_create( &link_enc_hpd_regs[enc_init_data->hpd_source], &le_shift, &le_mask); - - return &enc10->base; + return &enc20->enc10.base; } static struct clock_source *dcn201_clock_source_create(