From patchwork Fri Dec 8 13:12:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 13485382 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 6E360C4167B for ; Fri, 8 Dec 2023 13:12:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 55C6F10E2B7; Fri, 8 Dec 2023 13:12:48 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id A98B810E2B7; Fri, 8 Dec 2023 13:12:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702041165; x=1733577165; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=6qwZ6Ua4pCUhWUdKnqmqovfPOTdzzcnWO8vF5EhNuCc=; b=FHNc3+h7qsYVSu/P7tTuYiOmOL5HT9zBROiz4SWvnzGd0pKmuoCqy7Zz /2ex3yFvYblToTmiALTM3JVtQniLn9W2RJg1PjJq+rFoP2qHb1HxRG7uC sVtsghD3vO4GcnVgjbUhe84Zcsb44E4vHFCVpD4S3zgi1hZ8sUvwas6vW wJf+ScGLpKjF1AvzuITfzUNVmNAz/D83hbYwzQciqYiEhv2bJk07JGG2I J5JpbLptxydYkLBmk8bU0at0UR0S8HiHGR3s3kLyYi0u0tTr8c5ejwX52 m8l2kXeAAZXtrNtfKEhwLgke+Z2KLccQwIro70IVGanuzY0Fk9Xfni/ue w==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="15955429" X-IronPort-AV: E=Sophos;i="6.04,260,1695711600"; d="scan'208";a="15955429" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2023 05:12:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="772125002" X-IronPort-AV: E=Sophos;i="6.04,260,1695711600"; d="scan'208";a="772125002" Received: from mvafin-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.63.236]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Dec 2023 05:12:42 -0800 From: Jani Nikula To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH] drm/crtc: fix uninitialized variable use Date: Fri, 8 Dec 2023 15:12:38 +0200 Message-Id: <20231208131238.2924571-1-jani.nikula@intel.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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: jani.nikula@intel.com, Ziqi Zhao , Maxime Ripard , Thomas Zimmermann , syzbot+4fad2e57beb6397ab2fc@syzkaller.appspotmail.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Commit 3823119b9c2b ("drm/crtc: Fix uninit-value bug in drm_mode_setcrtc") was supposed to fix use of an uninitialized variable, but introduced another. num_connectors is only initialized if crtc_req->count_connectors > 0, but it's used regardless. Fix it. Fixes: 3823119b9c2b ("drm/crtc: Fix uninit-value bug in drm_mode_setcrtc") Cc: syzbot+4fad2e57beb6397ab2fc@syzkaller.appspotmail.com Cc: Ziqi Zhao Cc: Maxime Ripard Cc: Maarten Lankhorst Cc: Thomas Zimmermann Signed-off-by: Jani Nikula --- drivers/gpu/drm/drm_crtc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index d718c17ab1e9..cb90e70d85e8 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -715,7 +715,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, struct drm_mode_set set; uint32_t __user *set_connectors_ptr; struct drm_modeset_acquire_ctx ctx; - int ret, i, num_connectors; + int ret, i, num_connectors = 0; if (!drm_core_check_feature(dev, DRIVER_MODESET)) return -EOPNOTSUPP; @@ -850,7 +850,6 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, goto out; } - num_connectors = 0; for (i = 0; i < crtc_req->count_connectors; i++) { connector_set[i] = NULL; set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;