From patchwork Sun Apr 16 09:33:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212748 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 805E1C77B61 for ; Sun, 16 Apr 2023 09:33:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B237810E0A4; Sun, 16 Apr 2023 09:33:52 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 87F2A10E0A4 for ; Sun, 16 Apr 2023 09:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681637625; i=markus.elfring@web.de; bh=8uHpunreb8Uo0Uleoeb/IuBORjGn6rkAngQmsnHu6wo=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=uNQkI3B/K8Z8M3MrlYgymN/aLA3rRG1QZdl7qfW7GGfTCt2ZwMWJYT1D0At4y2bxz +5Kp5gsNaVI7W18qozcx7W9097C6nbxGmnKFhYjg+J1JO3Pq/Ktu8dbdOZjJKHHfEY fylNNvDuVmR8gTQ3WaLYsM7kQST9RWzk3OBd4n0c++b2bq9b7ENYRv2ylivJ/Y9xYQ pENXBa3nibtcnNjkMRciQtq3jJWUPvlwKZ6LFLhBu6nWkdUWsYQEQzlA86tWJl/hZq svypQZHuGRnMrnUHiucUDoBihHH0y3YmLM3Pbes+EkZboJPEVp47jjw3A+zYKFPJCK bujavS4tyRXZA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MsaS7-1qbYVm0bDH-00tdS0; Sun, 16 Apr 2023 11:33:45 +0200 Message-ID: <1903e057-57d3-e12e-da37-008e23afd2e2@web.de> Date: Sun, 16 Apr 2023 11:33:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 1/9] drm/nouveau/debugfs: Move an expression into a function call parameter in nouveau_debugfs_pstate_set() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:4oF3Th7JF7y2HCnR8fozd4gR12wECkP6ixJoym1j256YmWiDIVo 8GgH4sILld65578JRcAcU0gwMo0Bqhm9yfFuy3aU4LPez80+WkLFlNb+mZ1sk/pKTiK+que d1iRYCljX6TbqL+5MQ7+Pjz07Cp/Xqvo8DOxxV/na0LIac1BqwyBmnVHbu2AzbIHi0WS/La vNUKTLphOY36wAc8QbohQ== UI-OutboundReport: notjunk:1;M01:P0:iverrg5pEh8=;DgI8r5RfixMh57awQv5JoZe9evv FG026mdqqPWNWrAvBJwwgQkDaDRe9GIGjwdYnulqjkjXH9OxOoVtQDCqCYF4jBX4qFufLR2tT K07kZrysvb13t7DHKd198A6WaXaXie5YiPndQY1Wj9SzkSrL1gUSu81eC9EuQHEblM90Ajk5g KA0IAq992HsqnhHvUYEx//kGmOHkfVk10qlAOhxFMbLzXm2nOgZDdUhsvzki8jWpTBigY704a 6qqhue2nxvUiX4VD2asBzlB0McVEHc3cVxhTDmYexHoOxqVamMIBPHclnpQP/2Iy/jzzGzEdJ tnyKHXDgpN6iTXflWXXkFYq6h+l55bHqfyhwLvreL0Q1zOYq9i+/elzESPjnlx2GxyJLESEil k0na8bx9hUP/okmOgfO3tZRMZ1a49uTpk/phfd088SoSAsvcQlq7iro2dk/iZmM3SMS7lka2m kXjElSWdxCRYl8I1vQRvyGGYFoxiXs5UeIQbt5CIqQpPQgqYJbEBz3zZYu4NANb/K0fvKLLsB MPBKn1dnDAObTimJQVNTLW4uIFBfR3ufOOKOJ4uPIfjzzBQX0idBIUv+RuUljNsWO4UAt7SqV iBpvg0nd2xJY1pAfcNLtegzqYLDtDL/56z8k85pSLR+AfUgFNGd52in+Corq9sIZ988qDQVZ7 wzP6pm8C4QVN1OIsbxy7LztjbLHp0mbOOYaeoGXpOq9WNa2V2XeSunBZz3JXLd56QL+tbQ3WI E8IK+yIdYDr4Q5kEWWKcAERvP33BuKuEdxQjVKtiOjmhk2LStc2kQHWR6MCc0eV3HsGkV0Ixg iQUs9kWfVGpLNLHvNiPwbmrpo5Ta67t+SGIn9N20KADseQJ4E5/MaLNDIV/Q8lhI2v3pk/Zsa 6ztUaI4J3uzedEMBRimgkMSEu4fIdRUviFq5TDrHxMujjVKal9L+fbZNH 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: Sat, 15 Apr 2023 21:06:06 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “nouveau_debugfs_pstate_set”. Thus avoid the risk for undefined behaviour by moving the usage of an expression into a parameter for a function call at the end. This issue was detected by using the Coccinelle software. Fixes: 6e9fc177399f08446293fec7607913fdbc95e191 ("drm/nouveau/debugfs: add copy of sysfs pstate interface ported to debugfs") Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 2a36d1ca8fda..44e26b6e74c7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -144,7 +144,6 @@ nouveau_debugfs_pstate_set(struct file *file, const char __user *ubuf, struct seq_file *m = file->private_data; struct drm_device *drm = m->private; struct nouveau_debugfs *debugfs = nouveau_debugfs(drm); - struct nvif_object *ctrl = &debugfs->ctrl; struct nvif_control_pstate_user_v0 args = { .pwrsrc = -EINVAL }; char buf[32] = {}, *tmp, *cur = buf; long value, ret; @@ -188,7 +187,8 @@ nouveau_debugfs_pstate_set(struct file *file, const char __user *ubuf, return ret; } - ret = nvif_mthd(ctrl, NVIF_CONTROL_PSTATE_USER, &args, sizeof(args)); + ret = nvif_mthd(&debugfs->ctrl, NVIF_CONTROL_PSTATE_USER, + &args, sizeof(args)); pm_runtime_put_autosuspend(drm->dev); if (ret < 0) return ret; From patchwork Sun Apr 16 09:36:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212749 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 EA359C77B61 for ; Sun, 16 Apr 2023 09:36:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5224E10E0F8; Sun, 16 Apr 2023 09:36:26 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5210210E0F8 for ; Sun, 16 Apr 2023 09:36:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681637778; i=markus.elfring@web.de; bh=VbiCcvFD+Qi96Uu3AYsuuKIDaQ41gEUacwhrpgjbDtQ=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=bvRVPl4Ia3xvqrEI3P3GXwhY8OMAq1uk4d3kGw3Z/UgPtnsxa3zXyzBzyAmg9Xyh7 bb7AVKFDsABp9fevq51mXfAvo/WFHxs3LHvcLyBt8rKj21TeE8G1/eMhKkDiiMO7Kw z5f1u08cCNZ/NvrJDrj36fRTHUu2kpRv5CFAbWNd+msb/nlpD2jTyg7rX6Cnsd9CBL pd5MKh//ksGqNZdNry9t9gJobWkjNs874uEwMy5raDdwiHhMQyDMz9UX2nHMr/htcV woQvJAbmFexADhQOV+EM0uf2411KwDBi3mcCNRKW4oEQYA17YZkDT+C4FZhlmTZcpo OtqUsluEc8eVA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MA4fW-1pcTYe2hli-00C1jS; Sun, 16 Apr 2023 11:36:18 +0200 Message-ID: <5b7b99f7-1692-74e5-4b1e-cfa14dad7c57@web.de> Date: Sun, 16 Apr 2023 11:36:18 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 2/9] drm/nouveau/debugfs: Move a variable assignment behind a null pointer check in nouveau_debugfs_pstate_get() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:AJ9D9+EKDgZDPgbcMafxaHj4mOgWlvC+BvY25gB1NZGB6gNVx+O xhlki1nbLNhebMQqVZC12o1VYHnC/hTtQPF1DAizUyk2o7v3fn2fPTUi/m+RNs0cM8+MNFf ohoDmlpNTR62CxT6BFNOCtonYB30A9B+2zGYwJaAbi6U2WStWeJhow8NUeolN5fEtVgp6P3 RRdDPeBeF+6FzYAzg1i2w== UI-OutboundReport: notjunk:1;M01:P0:QjjVPRb86F8=;fu40QwhhZ7krKM5qzzhEljFcUJK XerCFtOp0fprmtouuw68y0HUJO9Jegsz2JrA4BHlR5GU756/y/E6zWAC9H29uMm7FtP5fKoZI 7pKW0IHcJCXhiBPdhiEH2ajrSpKrl9WBotycGDRW3S8zXOQ1uINwnJeagFf+mXX0OfujxBfzv qb6whXfUiLq4l7Nbr1IwQAd0mdeXZvScB1xim1dbi/eLaa6GSvqksHXxZ5KQYB8wF3Kl+rUQW J8l++5TQpRpwkkyW6Bfx5AvV53P9H364AmzfRvY/6OgkPfyeSiv8R5TEE3u2LPeCOO7aabTHf zUk9adxyNn1RZKg3qOv7MwiRnullLjK3wlPoQfGKjpzYbXp1AnX7EsyLrt7I9YJUHoNOG02XG w8q40jBhVw0iiYDJDNDvxLbBiTtYj6buaHy+ueOVV6CO7qQ5UxCmNq4kS1epywh6q0rDeHMf2 uzGY1Ru8eIwdcNc+0fvyv2n63+KPgSy/1fO5kXFndfZWWdkH0IKZ3fQnYRxf4PvZH8VKtozfw L71nAqtuTWY8vd75ZrEgo7Iz6O1IDOz15aBqRvGe6nSkdhFeOkzg4+a6P4Aa2Qp6jEjDW5f+L //xfF1lQnP1otd9jFZE3dA5jCGRu6gVS9bXnftKSrYJ+sO/HXcvRugBVTqJM5Xp3XRR+pw81N ateYnAQHL9R2JpRVlq+tRqA2HdqiYOi8FaEUedqFagm6Y5gEdyfYIE3cf+ZZiv/6ASfegVRnh ZP21M/lIkKA1lp75LnXDgb//doYV6cbI8B5OME5YezLQnM2gVK5lS+ekurWURA4yfeoot1Bqg UFoxXK1RNMljJ6aBuqD14SXtO84OKNsst3VrARHG0dif0qc3yE5R0qO4imYi1vZLyi7V22665 +wCVUfGaBt7nL9y7yLmurSZTrjOReeG7OgPz2BPe5+hrXKppTHOZdQape 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: Sat, 15 Apr 2023 21:24:43 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “nouveau_debugfs_pstate_get”. Thus avoid the risk for undefined behaviour by moving the assignment for the variable “ctrl” behind the null pointer check. This issue was detected by using the Coccinelle software. Fixes: 6e9fc177399f08446293fec7607913fdbc95e191 ("drm/nouveau/debugfs: add copy of sysfs pstate interface ported to debugfs") Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 44e26b6e74c7..a859a086f308 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -73,13 +73,14 @@ nouveau_debugfs_pstate_get(struct seq_file *m, void *data) { struct drm_device *drm = m->private; struct nouveau_debugfs *debugfs = nouveau_debugfs(drm); - struct nvif_object *ctrl = &debugfs->ctrl; + struct nvif_object *ctrl; struct nvif_control_pstate_info_v0 info = {}; int ret, i; if (!debugfs) return -ENODEV; + ctrl = &debugfs->ctrl; ret = nvif_mthd(ctrl, NVIF_CONTROL_PSTATE_INFO, &info, sizeof(info)); if (ret) return ret; From patchwork Sun Apr 16 09:38:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212750 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 7826EC77B61 for ; Sun, 16 Apr 2023 09:38:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A508B10E2CE; Sun, 16 Apr 2023 09:38:21 +0000 (UTC) X-Greylist: delayed 461 seconds by postgrey-1.36 at gabe; Sun, 16 Apr 2023 09:38:18 UTC Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id C4B8210E1D9; Sun, 16 Apr 2023 09:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681637893; i=markus.elfring@web.de; bh=/v7J9qb+S1Ei+KmfiIERdQOeXfeF2fvCstCNfkjfefo=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=gzxuTj6gjxWHu58rBVezOb/3F/NsssK+m70GUAh/RbD7CaKO0NKeGST1L1sTzweAY OwupIJsfN466JB5oUJcLaYORSeMhJDxnrRqBSuThwd1jJx3DhnofOPTy8s4HLf3plf 7HPzJlGUnCBI9Epy6BcJH2aefLid4j4fDAvuone71VjTcZ7AbCjn5FhcfPIxVKcOtk wCTGa6v6IwlFs9OeFJlTJSFWViR6OldIsfp9Ryj4rKzSL2UMEzF2YATmXo7y80aeRo o41uyjRkTPh95Dm+W3beO/dNeHEd4vGGnJ/QIBVV0cUTf3yt5daimdCETWKEBkhHIR ml8ewscdF2qog== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MXoYS-1prHBZ1QL6-00Y8qj; Sun, 16 Apr 2023 11:38:13 +0200 Message-ID: Date: Sun, 16 Apr 2023 11:38:12 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 3/9] drm/nouveau/debugfs: Use seq_putc() in nouveau_debugfs_pstate_get() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:4D4ESLHPB8pyiBmbTozBYVsVfRFBzRRNDKTiTI7dxS4chI5F2c5 enS3S4JZ7OYOci9SvxH607Us8zZEc2uGkr7kzS7dLUF9vtJ0emw9MQ6rPjJmsTpGoZmr+Ej YS9pdQ+HrlIElxQ3lmYIyRm1ljmzG6lb5VS2Ng5HMuvq/L9qU82GVnLc9t+8SbuLzgWre13 tj+Hvt6YvXZpHeg0FZaEg== UI-OutboundReport: notjunk:1;M01:P0:H3TNyIVyf2A=;+bPz2fL98vAVhmLicVPq68J01Ya Hsa62yaENUDxCVdka8agUgVl55jQd5CU5SAqaaAx9Ho2tkZss1B59/QQyb/U15xpYVvT11zwx j9DTO3vLbkmI8dneTK7+zZFZQF0ctYRUQpApw9c42xdLda7mJ65J3NbYQ9AW9ss2rZzfpC+mG 45TbJ6DcP6nvvfvcjJvyasXnX4R4znFeIoTJ7T/+rafG/mqctE7hTAIKxBLLTcPQ8dmAh/VYB lnJBcs2bJiR49O6PWVUol7rWPQhitkFV/mXl+ccVAilcScMdrgZoSgo1dmN36J+WuTV//RMWI iY3vEHmagZD7aOQj8Y7LxjphPnnIBXDVw6m+03A6A81f3NQLrWUP0TNx1VNCDMIeunoDaMdBW hhu2p0Hv6VDwuP0tZf46r2QV8lY30HblYtMXm4jv3d/4iRol8Tath7xQ75Yx+tQQT7e/rup1S LJHb/RW5yVhLQMfRQ2VBsS/5xZ16ZIQ3FuieW9JBRvNLrXS97n29Kxw2HO7khW2sLmnF5Uz4n 0K7BQSxEqWmF+4dXIJqfkc434/WhuMAvSNfVI/JPaynP6krJh6weuo9rqXyYOpzvbxe7GwIBM 4TIlWiCW8fzpjwAigQz7BIdErxDcRkmtQfxmkZaUK5Aer8iwihNRocx1rMZJk7GPaDDrpd6eh sGRAN06QWI2jd6y+g88E9Ab+za222qmfuN+G+mk9V3yHKZkf6hcPNasTow4s0gfC41vZjfyhX +fRnxw83huy2tSwk235g6KWmbq9YVCbzyko6P8PQmhQGLn7O1a8Kb4pX4n02N1ChtukriYZ+3 V7EuVubeHCawnKobPkkUTfweto0sN+Ykem3dy3YzjF2TpDJD8Js6N1OReJc5+JJdOLC/qxyhA XZyx8T/KnZ+78a2BqOCV7eG5eo2MQLEjh7jsuwJBgNIPr6EbPPpc4X1Mu 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: Sat, 15 Apr 2023 21:48:47 +0200 A single character (line break) should be put into a sequence. Thus use the corresponding function “seq_putc”. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index a859a086f308..13c82eea8828 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -132,7 +132,7 @@ nouveau_debugfs_pstate_get(struct seq_file *m, void *data) seq_printf(m, " DC"); } - seq_printf(m, "\n"); + seq_putc(m, '\n'); } return 0; From patchwork Sun Apr 16 09:40:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212751 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 686E1C77B76 for ; Sun, 16 Apr 2023 09:40:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C17B10E130; Sun, 16 Apr 2023 09:40:21 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id E70ED10E130; Sun, 16 Apr 2023 09:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681638014; i=markus.elfring@web.de; bh=+NCsfkXOgfuHgoQl17J8LhHx9x3ANJMwQ5mx9xKblt0=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=pzqg3t2qAM3m219l/pA9avqJGTNlIlkgDmHDFLaYF5w29VTNZ/QOZ12N7zw08tCAr q/9XG1SYZx1okSEYUjbNGPrDpsI10RKVN7XwyPs0xMmWMGhMM9BenohNpJWzfY8fGV fdYSHCpVwnIRTqj/AHA9FzjhRcHRp5ENsUpf5ga7K5cf7lJN6KApaodVE3TV2Y1aaE iVt6wJH93/8BFokSbwyO6GPeMmNizJ+RA3rO0i+fBHxVRZxeu1jA3lCboB6ykZcMc9 r/+/ubID8CRdvYm0WLtVQFgiX9qQLNRP8jxG+fDGCp6NQrr8r9nIKdtgQ/mO1Y4DA0 967tp06U3k9MQ== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1N8n46-1qRyYK1tfq-0162Pr; Sun, 16 Apr 2023 11:40:14 +0200 Message-ID: Date: Sun, 16 Apr 2023 11:40:13 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 4/9] drm/nouveau/debugfs: Replace five seq_printf() calls by seq_puts() in nouveau_debugfs_pstate_get() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:DOJiTspO1yVyqj5IRQ7Ck8IrgQpJ3wpqDiP4YB6SicStSNsT1Wn zp7gzbThX2mCd7NQP9lFztsSN3AbdrHL4LBRg4RzusLl0mqq2AYR3d88j7ApbbiVAZQyWUK LY2CTCL3HOldVjlLD6FREpXfB9psxEG6m/vbkd+VHWgzOPwxmgJDzVHS2+xrWwaKbxmmvZH Xawl5dHvP8+cF9FOr3jfA== UI-OutboundReport: notjunk:1;M01:P0:vNiijIQRaJM=;tWbqBgSB+ngyZfoRofZ0uVvXENa Q8zDybNEY/Kbdtz7HRgy3rueuLGY9NaCbEDrLjc5Aa0VlPfqGWWf5V7r6u4Byl6b+QbIDdjsC 45awXuBGjpYxOqZkq+9aqTifX/KR3uPR+Bfyctu8hXxJzjB61zIXpG0lYj8h+HGBxECJxRMbw UTnjLEsC2x9LaiBrmawNJ9GUhyNfFRxA4XQjKEKfKCClZ380ZdkwCxXQOYmcQkyohRhbkUnWV 0mQh32fGIhe9R2VxLzHNW++qDVB1xqWS/MDgezikZp5Yf18ht/GHAii5mDk2ucv5KTLPtTRjV znGy5eBwFRRAfelcyP72FokgLm+WeWeVqlptFdCOcZfPcYnIDLqW5f/glKWfZg3sD07UPJ4jc shVu7LcdDbMGc4BUIrBSYOYlP8rZlz4qzuHLzd8Lws91J9ZwLLzcAW7UMuq3OsMN0qWW8Z72w uPVpre+Nmc6Xfnp2UPg71NNL6nmz84oVCo7o1x0CgYhoSn6WWnBGAQNRCZCSqRwNgS05gCrku CPCGjDobwoeHjdf5SYgfNgXu5yOU6oll5bkfJ6HYZsWB8DMq9cARlLx1sYVTxYPSEQcG4TVQa bw44HMYJ4ZXGFJwqfJfQPuCPB0LV23+M+I3sYIkph/J8v/V1DnHj+L8d0RmVYApLHFOnmLUfl DEs+GdhYvLSKjAVHhk+pdmRAZ6Sku33p3TmlUEHIhRQ1ItWw+74ROlG58nCAkwhYS7oeVWIkh jZLAPS1MwBv9QRLSe+TE/YYiTY9FOdno237aX5Ux4dQzyvl5eV9EVp1m/yNYnn+HI9aFYNwXI Lxeetawd00ykyklv2ji/zl41wEfRzE6/cri1mRCrB8j1ud5lOFqzY0pTPb1PeIu0QTe7o3ZUv eHdDLj1y3Czq+OS11ZBrOmbuNGN9Kre8l3hx9pfWiOwAsJuGdz++yHI30 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: Sat, 15 Apr 2023 22:02:31 +0200 Five strings which did not contain a data format specification should be put into a sequence. Thus use the corresponding function “seq_puts”. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nouveau_debugfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c index 13c82eea8828..99d022a91afc 100644 --- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c +++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c @@ -120,16 +120,16 @@ nouveau_debugfs_pstate_get(struct seq_file *m, void *data) if (state >= 0) { if (info.ustate_ac == state) - seq_printf(m, " AC"); + seq_puts(m, " AC"); if (info.ustate_dc == state) - seq_printf(m, " DC"); + seq_puts(m, " DC"); if (info.pstate == state) - seq_printf(m, " *"); + seq_puts(m, " *"); } else { if (info.ustate_ac < -1) - seq_printf(m, " AC"); + seq_puts(m, " AC"); if (info.ustate_dc < -1) - seq_printf(m, " DC"); + seq_puts(m, " DC"); } seq_putc(m, '\n'); From patchwork Sun Apr 16 09:42:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212752 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 57E5EC77B61 for ; Sun, 16 Apr 2023 09:42:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DC2C10E2E7; Sun, 16 Apr 2023 09:42:23 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 587B910E2E7; Sun, 16 Apr 2023 09:42:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681638136; i=markus.elfring@web.de; bh=lgS1D4M4giXfq9onDRIVPrtymyGrqry6IsUpJ8t1W14=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=SrFM4vR0iVIhNqq/22VSIFSKpmJJjqkaX+yf08tztkbRzvWZOekuAmLpz7IzHbNxG EwVqvPsywpIGLW29aQO8AuhlZQokzUpuHFmapW3CYQIjyFWJQ2VtHjzDaz8rP46Oce FbxRNOUKUzYR48EDjjlpxVgjYJUnhHHu2NC4RlLP5ncemXv9ZZUfzwZwNxSGFEvwQ1 YfIBK3Biqycn2LOVg2dJQiCcbXcBm4PYPc3YhTmL+DgzyKvYFnak4hEtvgC3u7BWIN E3a7ypDyXxoCU2IHRw7qdxzax06ui+3u2vMkxtaq+IE6HBvWDImTGnl29r8rQf4gxd JfI7lw0ahYtnw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MdO9E-1qN2bH3Yw4-00ZUwb; Sun, 16 Apr 2023 11:42:15 +0200 Message-ID: <529fe82e-59f0-71a2-1e33-b051f833b67c@web.de> Date: Sun, 16 Apr 2023 11:42:15 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 5/9] drm/nouveau/bios/power_budget: Move an expression into a macro call parameter in nvbios_power_budget_header() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:aiPmQfJG06hSJK2eCipymGgnde+p2W0i8rwt96FvWfIh709EcJo huBlDJaHqtKRwjAw5FzH739qc+nTz+sl7BKJQuDI6zQP3z0vowOFIdOxbwP7Hwl8QLmhJfe 7DwTfvwy3jdKcqhGSUC4FoykEWy7zvQSdAji7Q7MiY8hB1EvSgcBoYP3NvQqrNvu0rgzYHl gBZaGVhMoZbinNL4Wyhrg== UI-OutboundReport: notjunk:1;M01:P0:WfemR50h7fw=;I11z2a74WOXS6RqcP5qwGcJ9Mrs TkV/M5RkJMl9d5KvBZSijoUqI/pHt4AjPLB9Zhm2Orm3adoBtEfu2Vuq8wV00x9TcXQIfKy2c NAteq8yGb7mwsVeCFTljwhBR9DoObdCs3TaxMc2zNCIRQAmjXRftFOSgMl/xXg3SRY2emzUdA U6wRjmY6u8ofo/vI6gApnlhyX/XsZqatiJcJeVS/tl97TMe5Fa0Pabt8eLKa/LsDH/JMcAjtu p5rp8P1CYPbb+aEHcdJVfFElIxEtLvirpJMHTOW3smFoGhfzrGyV3tvWT5rRrK7g02J/H158K YTGen6ipZxaR3GnG7pnzOHTAv1qka7RQ0NT9k14WpdRAZXAu0nZFHVaR2a9b1KKdYr7bfTT4X AaExemkCRuM3zU9anbFOhNFhIfiomVDMZMO0qUupgm+CWU9G22912OZGy55ZlAPvE8le0KGsC MLTIoDLNzl4GR8Tof3RCU7KRJD/31Drm/3N3iTGlwGTcDCKK1KMwJJNgghLHpO79QaQ4/tyUb qVIX55yOJyb1I86CTBHTKGAve4qPdJSeN8nqWTTH9BsskD4bawcTVftSi3pj4igEAfq8naYdQ zi/yDa3ozYoywgWSDHt9RHbMaz1bZ4nFqqUysjagGWKeHV7N96CpX4JCh3kcvRmE8PAAyBcd1 ZHZNnuMRrWyE3WDed2ncjcPUXIcHCrv7JPk9PlBX488cntWFsW2ocbslyuEZtMlJ4AdaRZS49 9i8O7BKNgtp3u2dNMvW7G8Ae7SQ/lVdXipx0fqeV1Zizhgje0MrV6ksLGRkq3+pTgkzF426q7 kj4XUiVdx8wkj8Zv3/QoWevlRb7NNs5DgiW98Nz/5F1kR0viY1aR9jRjqDGYwXsd6zeHXwJHV fOk0ALSWX2GtS4OlbI9aiPpClaLbkyCjcaQWm0NE/0gjiq5ECktJQj2pi 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: Sat, 15 Apr 2023 22:30:30 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “nvbios_power_budget_header”. Thus avoid the risk for undefined behaviour by moving the usage of an expression into a parameter for a macro call in one if branch. This issue was detected by using the Coccinelle software. Fixes: e5f8eabc0077ea3f77b3362e28d3969ae62e70f0 ("drm/nouveau/bios/power_budget: Add basic power budget parsing") Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c index 03d2f970a29f..2ba992bdb19d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/power_budget.c @@ -59,7 +59,6 @@ int nvbios_power_budget_header(struct nvkm_bios *bios, struct nvbios_power_budget *budget) { - struct nvkm_subdev *subdev = &bios->subdev; u8 ver, hdr, cnt, len, cap_entry; u32 header; @@ -82,7 +81,7 @@ nvbios_power_budget_header(struct nvkm_bios *bios, } if (cap_entry >= cnt && cap_entry != 0xff) { - nvkm_warn(subdev, + nvkm_warn(&bios->subdev, "invalid cap_entry in power budget table found\n"); budget->cap_entry = 0xff; return -EINVAL; From patchwork Sun Apr 16 09:44:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212754 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 7D839C77B61 for ; Sun, 16 Apr 2023 09:44:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE64410E2F8; Sun, 16 Apr 2023 09:44:19 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9454010E2F6; Sun, 16 Apr 2023 09:44:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681638251; i=markus.elfring@web.de; bh=n41gQARwukkaDyUnJDCzmOZrW02lD6AxTHrmVuVuCEg=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=RJ80FrIqGvs6zBpUClKiNhle9Yu4n+NMVf3DqRPZJyvhldcuSg9t4rykBvsWSWx6I /T+GtC2utkKxFSaOJoxKERM1bWq/nybgmppzTbkcs+h8aQjHMuCbokHDFzlbe9qTP4 keVVwzHud+EYV+Li5I7SXMiYTWYjCaf9d4c2EbhsttJ90BIpvl7x3qw259xTsSyKT3 uO6iIgHMgDskXfHZ0b7F4ofFivQS0c7alcAT+d6GAyLrOQO0CwcPgUBLmR1JqMl6QF E58v59Ytd0xj3ztAVRuIc1zGtNPMaTNxdlr2Wg/yIUsoOD2/RbDGdQ+K289WtbAt2/ Q4hgNoHpMyYkw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MCGSU-1pefFp1ysc-009TBU; Sun, 16 Apr 2023 11:44:11 +0200 Message-ID: <6435d829-2c9b-a3f7-c8cd-cf923508a092@web.de> Date: Sun, 16 Apr 2023 11:44:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 6/9] drm/nouveau/clk: Move a variable assignment behind a null pointer check in nvkm_pstate_new() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:ODzhENw+XW+cNy69bxLsZXHfyG05+9RtBh+2vTyrh6Z+8DxqdGR 8OAVcxt8+Utl3xdxvXvI3nY5PpyoGQTUGr06U+RSDttOnkz6tMsVf29j+mn5mwOImjmcVpo zWH6m+duQWzHeABBTzABLHiuwtpJty+AOIuX8o6RsJNSXbVaXyc5HmacSlKbDZH5g8SSEqw D8/R+9tdCjVHoMl8cqriA== UI-OutboundReport: notjunk:1;M01:P0:fBJoNokfgZo=;9w9dNcYmRVyg5DJZRXvBx+samPs ztj0sTDy/hrsksoH9Xx+u5tZIeizXgpcXDG0id/w/nPQTXkMuJuh9GQW4+txG7p91qw4L6opG K6KTIbM7NSkQSO4eVOVSLT3WWv9P5Pf8wMt5vyeX6Gw4yuOQwrHrXwjkxmvYwR0DoT8op7tb9 Hrv9WkRb5Wd5NTzuvfN6cUOLm+4xEJkGrjtfJvIV+wEOe/47FmycJCMH/A+gQIV19nu8ZH9Ui Cf3PS5Gu89ZxZT5wfD5GTJFGpsWvUtfeNKTULL8bz6jV8E7ZJElcZg4rzF+pZ2G0ToecCf54v 7lOvEIz6Hl1CNCVmPFMRQe4rHzFGQmpd/oHg0n3QzXOtaa374qpVpFTkiqEmPZjN7S+tKOm/X 8G5oDGYqzM0KP6QVPSDfqtliMmCRhWeNKNYNlgm49E5Y7wWoEsK7Z9DEIMpS3EbswQExFt98B t4Ir89kPLpzskp8AXXWroBF8V3SSuKgQOWulWsxMmC851QlW9J1NeoU11w1r8JW1inTbHNfwT SFZIUZjjbWg3xwQJRg22ruxDzy7q/yidUp+gUd/FmpCgZUv6IKvUTa2sFyoDCjah+7DsFe2Vn OtFGdFkTeTFV5huDhVXFdaqgZrXHjIq0qfuLOxQ8ZdWET8TQIWOFO+kQnX75Pc/TEtfcG3NCd ysVr61bHNUzdbJhTbiu9TRIYrty4sLs3jHp1BngcKUEn44qo4Sxtrq/LlwywJsmUUZfZtcmuL SwwNhZQ3Pn/xET1UeTNdQoIUOlWx7NODN4LxANwE/uLcmVTHf0ZBt77fP7j7I7kwLu1hYHVXX Mt9CPqNn59z20+mIusoc7SsPwOD9/X5AEFkb0vWED99suFm2Po8tvOF/hamU0rql9ZOOH6HNE UF2vfFFM3gXYmqfKDT0vbMm0V9bukwbRhbaBbygLQqR0BjBsnrFROsvV4 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: Sun, 16 Apr 2023 07:45:54 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “nvkm_pstate_new”. Thus avoid the risk for undefined behaviour by moving the assignment for the variable “cstate” behind the null pointer check. This issue was detected by using the Coccinelle software. Fixes: 7c856522069755ab9d163a24ac332cd3cb35fe30 ("drm/nouveau/clk: implement power state and engine clock control in core") Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c index da07a2fbef06..178dc56909c2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c @@ -417,7 +417,6 @@ nvkm_pstate_new(struct nvkm_clk *clk, int idx) return 0; pstate = kzalloc(sizeof(*pstate), GFP_KERNEL); - cstate = &pstate->base; if (!pstate) return -ENOMEM; @@ -427,6 +426,7 @@ nvkm_pstate_new(struct nvkm_clk *clk, int idx) pstate->fanspeed = perfE.fanspeed; pstate->pcie_speed = perfE.pcie_speed; pstate->pcie_width = perfE.pcie_width; + cstate = &pstate->base; cstate->voltage = perfE.voltage; cstate->domain[nv_clk_src_core] = perfE.core; cstate->domain[nv_clk_src_shader] = perfE.shader; From patchwork Sun Apr 16 09:46:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212755 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 84179C77B78 for ; Sun, 16 Apr 2023 09:46:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 35A5B10E313; Sun, 16 Apr 2023 09:46:42 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.15.3]) by gabe.freedesktop.org (Postfix) with ESMTPS id D11A910E300; Sun, 16 Apr 2023 09:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681638393; i=markus.elfring@web.de; bh=B4nuL0fbXbY4PmTiXJZNvK9dh47DUmihZMJ6KCRWbEo=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=TF0Nwc3l+xoYuqA2JKn8KDHPMvngfNZMW8vYj/6PyR6xPttK0N1KBpdOVQb4KCr8O zEIdpRsL3YnBn3mHMa9/cSvH7NOwWblmGKnLnxSg92HnAEvMxICMWjQ2XHTprsGkaU /33oFCOvfm+3+126+qFS9J/4B5nuugqMF7LsQOnm6vsZYf/zEUtNG84ykVq9mOeUpr q8DFH0rfBCtZkhUzTl+3XJVw8p5ngbWZLlsS0E68xn9yNypspWDe6p6t3CyCg5wjhV qOUKF1BShdT2yBIal5EZpHSw6zDvyp+BvZu+4QIMDd8I0VEPpsBZMkWUiOSOWp/VHy pLmD5Wc8GsIHA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1M2Phi-1pmLKx1eYw-004Hbw; Sun, 16 Apr 2023 11:46:33 +0200 Message-ID: Date: Sun, 16 Apr 2023 11:46:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 7/9] drm/nouveau/pci: Move a variable assignment behind condition checks in nvkm_pcie_set_link() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:WHlB3p722Ku0tx4+HuMXdFub+PZRs7lny9GdhiDV/7pFZxj3JTX o/lJm2/khsGcjGK9tqQHDbos0ch0nCC2EKl9NGQndDOspINW6FlK+2m3ghBL9etU4UbcdGY G87wO62FoVddKF0iqe3PNAwOIlkbjhAqyr2Me6ms/uydVn7eoLkwyl2ApBqEIlXQm7EAiY+ yCbSzzGIx9nTKam83qanQ== UI-OutboundReport: notjunk:1;M01:P0:Q00Q201qcno=;SdVsotJg+5+rl0B6Tv0hduHhx8w NZg1PEpj0soY6scUI2Rw6RHheGEcMadB+NMW630a2X7+9jOzG7ttrNblJJrudwWu9xxqlEERD opnCi+Gvvwd80TJJbQifaFIuCfud5S10QXPb32IipZoSjQrvYEExtKDsexaJmaSyC5MhsC1VI PVZN5GDwpBHqwb97rweOZ8A0BTBYoC68tmj2s/y7TrQZ3Vx4KiQOyaXfmLCz5tB5BvVEtGYCy Au6olZHpqpXnn79Nn5k65TXS1d/t37H5HkFVgNXbyK9WY62QB/iYJpSTbotCksxZU7n65+ou/ Kpbfnhtvxz5Xrujx7UnjqQrconMRb540dDL5vzEeyIjB/N9C85ocKsiW9Iez076hRwN+oSyUi gyFxNwPExNsYXxNFzB2/mkPempDP/MGPRj/7RiPpEkjDNAagJ/dSY2Bl9gw/BZqIryksjowPW RPkN+4pUpqtEd5+Y+TIEozbDAI1VniRGK+6u9+mZgGBwtrLkjacZYJUPL3LWTJoeRKKEaQ1So 5jsMByhoz46AtdZSan7qVmH+hloTOxnhd3GFu5HUwO2oaAiWwtWzMUMcgCFKHnl7pM0d/F56Q uCaJg4NCr96QM03skqbY+qPGsfbDlm5yymMXNLDTXveb+s/JmMvR6d+RxT007kiqQUvFHEarC 8qcPTddFjT0Ocg/E4z0dShrdA2gBZy2Jm7DHP14CRyYbM4Ge4I4Jw7Wnhe6bEVKq3WWYm5mfH gYpJg23hKum/isxo4NhVN1msg225mAPDsjOhMITC5m6PC5ZPdCktHLXpxTP7J/ul0Dpth1zZ/ HenU2MoRMRuwdloMUZNkuTU1SBf/nv4XpbT7NFSMRUhM/MfiMj2kpBNhYtJD5HR8rQgjVuuN1 ng37zy4RWn0JxqkDR1Zm75aXw22pMWeDpjZSrL6uxplHQj7oX2uA/Ejk8 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: Sun, 16 Apr 2023 08:18:40 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “nvkm_pcie_set_link”. Thus avoid the risk for undefined behaviour by moving the assignment for the variable “subdev” behind some condition checks. This issue was detected by using the Coccinelle software. Fixes: bcc19d9bf5cd8d49428c487adced1aa101271b18 ("drm/nouveau/pci: implement generic code for pcie speed change") Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c index d71e5db5028a..b295f100e1c1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c @@ -114,7 +114,7 @@ nvkm_pcie_init(struct nvkm_pci *pci) int nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width) { - struct nvkm_subdev *subdev = &pci->subdev; + struct nvkm_subdev *subdev; enum nvkm_pcie_speed cur_speed, max_speed; struct pci_bus *pbus; int ret; @@ -126,6 +126,7 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width) if (!pci->func->pcie.set_link) return -ENOSYS; + subdev = &pci->subdev; nvkm_trace(subdev, "requested %s\n", nvkm_pcie_speeds[speed]); if (pci->func->pcie.version(pci) < 2) { From patchwork Sun Apr 16 09:54:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212757 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 66731C77B76 for ; Sun, 16 Apr 2023 09:54:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 50A1710E04A; Sun, 16 Apr 2023 09:54:37 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.17.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 990CC10E04A; Sun, 16 Apr 2023 09:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681638869; i=markus.elfring@web.de; bh=LY4EBg2BdWLPjNGYjC3YZ3qcq9tadoc7hWdZSllHPfc=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=fIp3mt6z4Wd5OdTAyC9IBAdEfhqiFBFwdrQqcpb6UV2VQJ4ZVDCoHgSxWOtRfczNx kSq9flOmYAXNOwfESKIL4b63criUjaG0aFdEyGN4P2TlBlO4wtEtIi8ogklzJaFgVE HKMcKnu+eJnca4fgXf2sSXJnjtfhmwQ7JvIXJ4vcdpFKmSjXExeGlPs+2GyDytR6Hi 0MuGkXoZvyovKYHWjadLn4w3YKPNhZHzfMGD7lr0xRu3LVTix4O6r72l50MrBongRM We3Dw4xSFG7femJBozqMV/4lQLEmmjsL5qkTUcily1DL86I8cJobwUhT6fyU2f89vx IcTS9OtGHe2FA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MFJjP-1pYMyD3UzJ-00FPCj; Sun, 16 Apr 2023 11:54:28 +0200 Message-ID: <04e2c1f5-26c7-9a23-5861-3d8757556cdd@web.de> Date: Sun, 16 Apr 2023 11:54:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 8/9] drm/nouveau/pci: Move an expression into a function call parameter in nvkm_pcie_set_link() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:J0e0yr1JxAVW3GPnlcv9HTk5ueCQ7OmAOHYr8TWyPkLUlQZIYjp OxRdTBXpMLWU0b8VR/zdDxoteTVBlphkcMQsA+TCyfRmpGUtGb/0B1GUBa7R+u3jjV4jaWE L2UR+mx95QDP/punzQSPXWIT1wo/t60xwdO/4pDH4onlUewnnkUhEFWOK5AZm041A4f/Zq1 HV7TkKbzM9gZI8/irNBCQ== UI-OutboundReport: notjunk:1;M01:P0:iY2Ybj487Zs=;+JKNvsw6oP2MgAkUx4t/u031lMc U3Rs6wOrpAxEjeAeRvV3et1BdZArX4mqWjt0VQULSV7XTzfb2eoADJnsv7cEtCvNm/CB7SQAk hxIaODuGSUQ7WwM/RYzDZ5+Lh5JJRyVhK5KYOVTomffp3qqkNjcpf5in7DmGgWCqTonnWGL2E 3Z8rEyFOp/2wH68GMRm3ZTFRu0+3r5zpcr0Dz3nOLv9ostgvNRVvtqm9XpJhyLv9FTjkZsJDg BqvyuBJLZNraxwfk3jHCLhdGbhSTUTM2/EPOms3W0y/aTnIaICVjR4BhFbC0BBo56fru0DLuj 1jiE7zZREF9QBiVkyQo0buYIVcZ12Z04w9/ykPxqCXVza9rvAiuHpnsTKUONqzhxqUlb78Pjm gK4oYiE+m34/VfHG+vDS/OBXweQRkpIZzH2aJEC5P2K4Y2SHlaUlOoBpZUVLcd29nCMmVVSFz FQqFYeiyXGmP2HITOq9nQLDB+fNpFsQJHD6AyKRrS47cnr+bfsRCvgTBnuCABu3FeKEWIEBPq UCtnC+/MVD4f5YLF+mMPrgh1ZS6eF07f12+KdpVH15vq+rZwSH+sOX9AJMO4PLEp/9FJsaAUm DSuNMyPVi91eP7Cb33zWfBpJAdrYbVl9M7ALbi0LdSnIikPjFY4Qb4zuJ+ve77zf3p856qUPa 64kK6Z0pps3CLSL38F8UQZMmQxUxHQWTnL29YSBDaT/Egk4eyjYVJ8XD+f1c/9xl1mnSp7UvX unBoK8DpSvr+ZKBxAcIdF3gEv1E8pCxOlWZ3BeWwq7GkpHBjnnNBk+HlzXJPnGATRxFRcc39B Qaez1bKLpdDeLqoYVS1gsAciyxd9WlegVYGsVtSqGojw6G/3Bm6cvYnXyqQc0B9s3PXH6xzkH 8MEJDdrruDsPHB1sX6G+GNYcakFoCrumKq41fVk1/hf0aAyhUbUdGOk3e 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: Sun, 16 Apr 2023 08:45:31 +0200 The variable “pbus” was read only once in the implementation of the function “nvkm_pcie_set_link”. Thus move the usage of an expression into a parameter for a function call. Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c index b295f100e1c1..dd18d9d0bade 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pci/pcie.c @@ -116,12 +116,10 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width) { struct nvkm_subdev *subdev; enum nvkm_pcie_speed cur_speed, max_speed; - struct pci_bus *pbus; int ret; if (!pci || !pci_is_pcie(pci->pdev)) return 0; - pbus = pci->pdev->bus; if (!pci->func->pcie.set_link) return -ENOSYS; @@ -135,7 +133,7 @@ nvkm_pcie_set_link(struct nvkm_pci *pci, enum nvkm_pcie_speed speed, u8 width) } cur_speed = pci->func->pcie.cur_speed(pci); - max_speed = min(nvkm_pcie_speed(pbus->max_bus_speed), + max_speed = min(nvkm_pcie_speed(pci->pdev->bus->max_bus_speed), pci->func->pcie.max_speed(pci)); nvkm_trace(subdev, "current speed: %s\n", nvkm_pcie_speeds[cur_speed]); From patchwork Sun Apr 16 09:56:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13212758 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 7A872C77B76 for ; Sun, 16 Apr 2023 09:57:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C84410E319; Sun, 16 Apr 2023 09:57:00 +0000 (UTC) Received: from mout.web.de (mout.web.de [212.227.17.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id A632910E30C; Sun, 16 Apr 2023 09:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681639012; i=markus.elfring@web.de; bh=r0+PJdQ4hGk1HJh+uo+JIif8tJrueAMEY3mwlSLHrmU=; h=X-UI-Sender-Class:Date:Subject:From:To:Cc:References:In-Reply-To; b=mtES6whmgR9otWu9W9TcthNGrHLhJk3lpf5NK2lV9mOEj3y7NkGGTp8acRyaNKk6M AzXiQlAFSW9aXFpsPk2zFGevx6XgSBSiJZkB/a0vOIyluXHKWD4qdqVbZ617QyoXMi fFRl5TsjaotS3LeigZoiUV+zLnbt63l7ivKoTxAHlsTIj62+VCCnq7sIIYtLOAe6LB XEqsiDqMiYVixG2da1FhLtuyFGixV7R+ubjeX5X3S6AwkdgQGodGtIxEBsxJYJiBAj TyUAWRaBdhbRtiOeflL3K6cXT/PvCFx9YjNimYlqTx/Dlr99tOi7EY8wyW0c+MnIE+ uSuZHpN9T2cvA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MS17h-1ptjSx1Gwd-00TChB; Sun, 16 Apr 2023 11:56:52 +0200 Message-ID: <3d0215dc-74d4-2c42-2eee-7a5fcf62b9f1@web.de> Date: Sun, 16 Apr 2023 11:56:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH 9/9] drm/nouveau/therm: Move an assignment statement behind a null pointer check in two functions Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Daniel Vetter , David Airlie , Karol Herbst , Lyude Paul References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> In-Reply-To: <2a746461-844a-2ad6-7b52-03f13fe1b9bf@web.de> X-Provags-ID: V03:K1:WvnSLZ8JcCgMT40fqtD67Yim4ZvJgIl6oJCIwq+1/gPHEiaAl8q FhtXDlNawnxkcNTWtv875NFd9FxT1kFrqwfVPOWehFvliE95E2oftLK3nleN6PpZQmBrTIR dqcN7ls1xmnpH6Lx0jRAmSFNub8Av8hEqARkT3eoWHkCVnp48ebOrpqbliPFnNTNZ8/+tDp KOep4bZGKEzYHnxFvlB0g== UI-OutboundReport: notjunk:1;M01:P0:ZddhYlKIvjo=;RArXRPo10vQmCQ1pWSpjmtcplWF boRDeb0W74h79NEj3z/879cMkWGPWlpqSiTIIrqpZ8WHqgD9vR06i8tuM4o1RDeo0+zuAPdas g7kKZ9I3wJVXtFi8RYIi/xeq0t6xHOTSAkw23lq8+9PsHVBYI0e16xFZjRMHNBi8pDZtunlbs OL0qOEDn9Vs7r6DbVdgmGHxQ3Ru7S5FzfCloOBbCcwnT8ScjI0LkcIfXwS8C9HAfojtXNKmgp DjrjMDEL5zOSKjJMMJHr/MS+ylJbq6YpT/CrBBn15iPdIxw1ChtyqyDcvjD1I5R+xUClCz60P rYdJ6oWQr8zQaKfxKdD7OOX8Kdet9cWA2T7Avwt2JAWnh7/n3d9/Aa8ikFI+z87SLrjuX4YNM 1aNiqJMEGz93sk+iA5X5sPeZFJgQWxL7iy8JFRcKl/UJV5uZ3m/ZyyMxmKZTF1E9vul/8vEzI BdEoQklhJ5VWr7SuN2yT7xwz4xi3/TQglDWseqjWRr+ZrO6YUarqg6kPycCNXlU6C8pv5HMZ8 VPdIZvFVTesPT1Rb8PQi9KWGajs6ZxIY7vnQNqdKjccvlCNq90s60aeR6SFmHhcKjfKMWvG24 Q/xwQUHdWAEEOhFqcANrR/gVh2g5zfQTx/lDeNry9iqpm8ZcTbfqvMTc2BoeNnmoxaOV96aaC KS5JYFbu5xfu1nqjkPOJZSuwWlc5lplhWkd/O+X4l2qPwSVyKuVaEcFMGLwRx/5a7y88w3tsU aP43GwBHdnzfgm8o8r3AQXUvBNHinu4trUCY18oMRgTpsDYO7CN1QU9Cr9Zah7tsdYuye1DNT vgXPhbLFQyMD3jYma131HsHkJOIYR2V4AmhSjwH/BZDaMeiRepcC88cGNmrqtKrpl+yvtiIZV NFDT15KJgPVW8w5i2G+GeFxsZ+2WPkXJ2U3+SrFZ0ewx3B/He2SNXpIkm 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: Sun, 16 Apr 2023 10:50:12 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the functions “nvkm_fanpwm_create” and “nvkm_fantog_create”. Thus avoid the risk for undefined behaviour by moving the assignment for the data structure member “fan” behind two null pointer checks. This issue was detected by using the Coccinelle software. Fixes: da06b46b720687117178d3ee85a601762f1c36b5 ("drm/nouveau/therm: cosmetic changes") Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.40.0 diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c index 340f37a299dc..b13ba9b2f6be 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fanpwm.c @@ -98,10 +98,10 @@ nvkm_fanpwm_create(struct nvkm_therm *therm, struct dcb_gpio_func *func) return -ENODEV; fan = kzalloc(sizeof(*fan), GFP_KERNEL); - therm->fan = &fan->base; if (!fan) return -ENOMEM; + therm->fan = &fan->base; fan->base.type = "PWM"; fan->base.get = nvkm_fanpwm_get; fan->base.set = nvkm_fanpwm_set; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c index ff9fbe7950e5..bfdf4ca5625c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/therm/fantog.c @@ -100,10 +100,10 @@ nvkm_fantog_create(struct nvkm_therm *therm, struct dcb_gpio_func *func) } fan = kzalloc(sizeof(*fan), GFP_KERNEL); - therm->fan = &fan->base; if (!fan) return -ENOMEM; + therm->fan = &fan->base; fan->base.type = "toggle"; fan->base.get = nvkm_fantog_get; fan->base.set = nvkm_fantog_set;