From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A326274BEB; Mon, 15 Apr 2024 14:36:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191806; cv=none; b=GXipneDtnxw6/fSNRhP79FoPo1clzAGGGpGv73w84Er4TwuDwoFBZqf30z91se9RFE4t9795lDhLLV6iMk5X/KxXjGcpAS+AJvIsRnOeCDeps3e8Xs0qQbSnoF3IiNTjM2d8OAZRuhsQMBtT7tqK9kymn0bXzJ7nlWb2MzYiy1g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713191806; c=relaxed/simple; bh=ppNuccjMyxW+6P5ugVGnt1xh9EzRDTpW+RvgcbWEBh4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hubLNkwCFnD/4Oc09aZcDWqwCHMFuQZ6sX5E2uLgTI5GkNmQc4LVSdm38XfNVZmCOWXUeeiZj7biSalN4Avxp9dsJQSeb5rLqrV9F6Eg9+l5WVhjlj5AbUII95oat554A/9tJXDgFEs/A98PoC49NRxaJ0Xk1Mtpx2rph8nZkc0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fl0xpRMA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fl0xpRMA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1DBEC113CC; Mon, 15 Apr 2024 14:36:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713191806; bh=ppNuccjMyxW+6P5ugVGnt1xh9EzRDTpW+RvgcbWEBh4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fl0xpRMAV2WPh33hm0Ei5bDwEie+W/h1N13BIfY059/FMaORyLwyj9jkl+DKObiFi Javl8EAFh4AjPmi1emtDRQ1Z2gSFg6XXT7MrH2g90oLlSXTDhATEu8BpRtz/wyURrK vDlBNS9RZ3hWXy3Gkyu2QCZ5FleeTOx108ai93F8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Dmitry Baryshkov , Jani Nikula , Thomas Zimmermann Subject: [PATCH 6.6 093/122] drm/client: Fully protect modes[] with dev->mode_config.mutex Date: Mon, 15 Apr 2024 16:20:58 +0200 Message-ID: <20240415141956.165192491@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240415141953.365222063@linuxfoundation.org> References: <20240415141953.365222063@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ville Syrjälä commit 3eadd887dbac1df8f25f701e5d404d1b90fd0fea upstream. The modes[] array contains pointers to modes on the connectors' mode lists, which are protected by dev->mode_config.mutex. Thus we need to extend modes[] the same protection or by the time we use it the elements may already be pointing to freed/reused memory. Cc: stable@vger.kernel.org Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/10583 Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20240404203336.10454-2-ville.syrjala@linux.intel.com Reviewed-by: Dmitry Baryshkov Reviewed-by: Jani Nikula Reviewed-by: Thomas Zimmermann Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_client_modeset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -777,6 +777,7 @@ int drm_client_modeset_probe(struct drm_ unsigned int total_modes_count = 0; struct drm_client_offset *offsets; unsigned int connector_count = 0; + /* points to modes protected by mode_config.mutex */ struct drm_display_mode **modes; struct drm_crtc **crtcs; int i, ret = 0; @@ -845,7 +846,6 @@ int drm_client_modeset_probe(struct drm_ drm_client_pick_crtcs(client, connectors, connector_count, crtcs, modes, 0, width, height); } - mutex_unlock(&dev->mode_config.mutex); drm_client_modeset_release(client); @@ -875,6 +875,7 @@ int drm_client_modeset_probe(struct drm_ modeset->y = offset->y; } } + mutex_unlock(&dev->mode_config.mutex); mutex_unlock(&client->modeset_mutex); out: