From mboxrd@z Thu Jan 1 00:00:00 1970 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 D0080C77B75 for ; Fri, 5 May 2023 11:08:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 622A810E5C7; Fri, 5 May 2023 11:08:44 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 984AD10E5C7 for ; Fri, 5 May 2023 11:08:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683284922; x=1714820922; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=b8Pt1J8Epd3mw1q/W0GXTIf85j7LAEDj4buhjSsOyFo=; b=Fm3uM+vj7rDtq4AQlmlC4diVUJBgiMtu2qPIS8/4+EAc7uussqD7V0wC mnYfAoDeZ79S+fsX4W0XlX7Igg9sP91kr7eRL1b0/YFAbmEzHM7AEmsPK rLHsz9xCHM2lYUFdc5izXRTocK7owWqmZkRdwX3pXAm7pIml7wFd+SPHR k/K4uV6KLjuL50nlGcEFr5rrZbHVoLl7eap/Q7bej8jeotlIVO8B+Wxqq M4GMCcXcFOMClX4Wb9GMboEWUhHLcn9bVPjL5/q5d0ZwVrTmbPy2i8yLR wB5rbApbCxCHuF7Y9WZo3KN6hQt7MlICsmuF6HUpvNJX2Viq6ThyBKJKR Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10700"; a="435510255" X-IronPort-AV: E=Sophos;i="5.99,251,1677571200"; d="scan'208";a="435510255" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2023 04:08:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10700"; a="728028963" X-IronPort-AV: E=Sophos;i="5.99,251,1677571200"; d="scan'208";a="728028963" Received: from unknown (HELO intel.com) ([10.237.72.65]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2023 04:08:39 -0700 Date: Fri, 5 May 2023 14:08:28 +0300 From: "Lisovskiy, Stanislav" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: References: <20230505082212.27089-1-stanislav.lisovskiy@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix NULL ptr deref by checking new_crtc_state X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, May 05, 2023 at 02:06:34PM +0300, Ville Syrjälä wrote: > On Fri, May 05, 2023 at 02:05:27PM +0300, Lisovskiy, Stanislav wrote: > > On Fri, May 05, 2023 at 02:02:43PM +0300, Ville Syrjälä wrote: > > > On Fri, May 05, 2023 at 01:58:03PM +0300, Lisovskiy, Stanislav wrote: > > > > On Fri, May 05, 2023 at 01:54:14PM +0300, Ville Syrjälä wrote: > > > > > On Fri, May 05, 2023 at 11:22:12AM +0300, Stanislav Lisovskiy wrote: > > > > > > intel_atomic_get_new_crtc_state can return NULL, unless crtc state wasn't > > > > > > obtained previously with intel_atomic_get_crtc_state, so we must check it > > > > > > for NULLness here, just as in many other places, where we can't guarantee > > > > > > that intel_atomic_get_crtc_state was called. > > > > > > We are currently getting NULL ptr deref because of that, so this fix was > > > > > > confirmed to help. > > > > > > > > > > > > Fixes: 74a75dc90869 ("drm/i915/display: move plane prepare/cleanup to intel_atomic_plane.c") > > > > > > Signed-off-by: Stanislav Lisovskiy > > > > > > --- > > > > > > drivers/gpu/drm/i915/display/intel_atomic_plane.c | 4 ++-- > > > > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c > > > > > > index 9f670dcfe76e..4125ee07a271 100644 > > > > > > --- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c > > > > > > +++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c > > > > > > @@ -1029,7 +1029,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, > > > > > > int ret; > > > > > > > > > > > > if (old_obj) { > > > > > > - const struct intel_crtc_state *crtc_state = > > > > > > + const struct intel_crtc_state *new_crtc_state = > > > > > > intel_atomic_get_new_crtc_state(state, > > > > > > to_intel_crtc(old_plane_state->hw.crtc)); > > > > > > > > > > > > @@ -1044,7 +1044,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane, > > > > > > * This should only fail upon a hung GPU, in which case we > > > > > > * can safely continue. > > > > > > */ > > > > > > - if (intel_crtc_needs_modeset(crtc_state)) { > > > > > > + if (new_crtc_state && intel_crtc_needs_modeset(new_crtc_state)) { > > > > > > > > > > NAK. We need to fix the bug instead of paparing over it. > > > > > > > > I had pushed this already. > > > > > > It didn't even finish CI. Please revert. > > > > Swati did run CI and verified that fix helps. I'm _not_ going to revert. > > Fine. I'll do it. Sure. > > > > > > > > > > Moreover as I understand we need to check that new_crtc_state > > > > for being NULL anyway. We do check it for being NULL in other places. > > > > But if you have another solution - go for it. > > > > > > > > Stan > > > > > > > > > > > > > > > > > > > ret = i915_sw_fence_await_reservation(&state->commit_ready, > > > > > > old_obj->base.resv, > > > > > > false, 0, > > > > > > -- > > > > > > 2.37.3 > > > > > > > > > > -- > > > > > Ville Syrjälä > > > > > Intel > > > > > > -- > > > Ville Syrjälä > > > Intel > > -- > Ville Syrjälä > Intel