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 AE7A9EEEC00 for ; Fri, 15 Sep 2023 19:11:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B2CB010E67A; Fri, 15 Sep 2023 19:11:48 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A64A10E67A for ; Fri, 15 Sep 2023 19:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694805105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qlhBGfkitPynpuyk3bM+Zz7nsea7S00PAWmpHtl+RHc=; b=AYwmhdNpQIi1bCv7/YxFdOq/FNmrPP0BCgU0f9B5mhjbx8sgAaLBcwe8czqh/umYGFhniA 5haliTGbtKE/CAR+q0+VO2iXVWozGjyQrSDSJGijXs8OR6pUq5WmOSXtRhwIrReplFcjFe hBV/FUJZUN23sOyp5PtuQzlZIEVhTU4= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-329-k_tPDLvWMSq9sP7AigCzGA-1; Fri, 15 Sep 2023 15:11:44 -0400 X-MC-Unique: k_tPDLvWMSq9sP7AigCzGA-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-412190efed6so29046911cf.2 for ; Fri, 15 Sep 2023 12:11:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694805103; x=1695409903; h=mime-version:user-agent:content-transfer-encoding:organization :references:in-reply-to:date:cc:to:from:subject:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=C+xFlo2phjIOoSkAoWqGNtjiMQDertNO4uHm/G4t30c=; b=E0M0Vxs1otax7SSrQa3Fq49x0+D3hhWvnj5N8KSrAxRFrU3sIk1D99ZYqiplmZl4b9 0VlLTtZhsorHo1/LGvZJfh+x0EIXqUknRLclVEvl1gRa/DjzWAVCg5bG0H9nH1vdHp2w 4BO3ObMOLcNBd6hmblyscn6ajTlrt3EmhGZPSQdLq7B+ILF3Fds5IBAv6GjrlbroT6h2 RAozWXanR59UzSFBlw1wQHLMiObGOMRnCSFk3eavbrTEF3IZ+ORRoMjAlgsQyNVb/FHp FX5R5aFpkilcSTzaI7RaofUSOzsGncnHYtI8GOQbUxEI7TfVi2AeYoG+Tuqdt2N6EJoW vA5Q== X-Gm-Message-State: AOJu0Yzvsjwhtpif32Ifa7Hdwu/WPUtW/ilDhrwFLt7/n228dRVcjjYw ZlxJ/Cd8xdjRR/0VN0/EMJhUJggH6GZ8RlnvDKIGO91qceqbok9SkX69V5MnAsufIIfIT+pEnut eUkFpGLSvzHeMRECDfWZUJ7t1AuK4 X-Received: by 2002:a05:622a:1988:b0:403:2c55:3568 with SMTP id u8-20020a05622a198800b004032c553568mr2772997qtc.4.1694805103436; Fri, 15 Sep 2023 12:11:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECYsNBQJE1AB6Z7FOZWSrSbdiIB0pUluydANBUWg33WdJgAsEfBhnnciVSM57ZyMizUL3bzA== X-Received: by 2002:a05:622a:1988:b0:403:2c55:3568 with SMTP id u8-20020a05622a198800b004032c553568mr2772981qtc.4.1694805103186; Fri, 15 Sep 2023 12:11:43 -0700 (PDT) Received: from ?IPv6:2600:4040:5c6c:a300::feb? ([2600:4040:5c6c:a300::feb]) by smtp.gmail.com with ESMTPSA id kf10-20020a05622a2a8a00b00411fcc18cc1sm1340654qtb.64.2023.09.15.12.11.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 12:11:42 -0700 (PDT) Message-ID: <39edd165d79673b0ce66f27fefa8d72a46348b0d.camel@redhat.com> From: Lyude Paul To: Imre Deak , intel-gfx@lists.freedesktop.org Date: Fri, 15 Sep 2023 15:11:41 -0400 In-Reply-To: <20230913223218.540365-1-imre.deak@intel.com> References: <20230913223218.540365-1-imre.deak@intel.com> Organization: Red Hat Inc. User-Agent: Evolution 3.48.4 (3.48.4-1.fc38) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 1/4] drm/dp_mst: Fix NULL dereference during payload addition 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: dri-devel@lists.freedesktop.org, Wayne Lin Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Thanks for catching all of this! for the whole series: Reviewed-by: Lyude Paul On Thu, 2023-09-14 at 01:32 +0300, Imre Deak wrote: > Fix the NULL dereference leading to the following stack trace: >=20 > [ 129.687181] i915 0000:00:02.0: [drm:drm_dp_add_payload_part1 [drm_disp= lay_helper]] VCPI 1 for port 000000005be4423e not in topology, not creating= a payload to remote > [ 129.687257] BUG: kernel NULL pointer dereference, address: 00000000000= 00560 > [ 129.694276] #PF: supervisor read access in kernel mode > [ 129.699459] #PF: error_code(0x0000) - not-present page > [ 129.704612] PGD 0 P4D 0 > [ 129.707178] Oops: 0000 [#1] PREEMPT SMP NOPTI > [ 129.711556] CPU: 2 PID: 1623 Comm: Xorg Tainted: G U 6= .6.0-rc1-imre+ #985 > [ 129.719744] Hardware name: Intel Corporation Alder Lake Client Platfor= m/AlderLake-P DDR5 RVP, BIOS RPLPFWI1.R00.4035.A00.2301200723 01/20/2023 > [ 129.732509] RIP: 0010:drm_dp_mst_topology_put_port+0x19/0x170 [drm_dis= play_helper] > [ 129.740111] Code: 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 0= f 1f 44 00 00 55 48 89 e5 41 57 41 56 41 55 41 54 53 48 89 fb 48 83 ec 08 <= 48> 8b 87 60 05 00 00 44 8b 0f 48 8b 70 58 41 83 e9 01 48 85 f6 74 > [ 129.758842] RSP: 0018:ffffc90001daf900 EFLAGS: 00010286 > [ 129.764104] RAX: 0000000000000001 RBX: 0000000000000000 RCX: 000000000= 0000000 > [ 129.771246] RDX: 0000000000000000 RSI: ffffffff9e73d613 RDI: 000000000= 0000000 > [ 129.778394] RBP: ffffc90001daf930 R08: 0000000000000000 R09: 000000000= 0000020 > [ 129.785533] R10: 0000000000ffff10 R11: 000000000000000f R12: ffff88811= 6c65e40 > [ 129.792680] R13: 0000000000000000 R14: 0000000000000000 R15: 000000000= 0000000 > [ 129.799822] FS: 00007f39f74b1a80(0000) GS:ffff88840f680000(0000) knlG= S:0000000000000000 > [ 129.807913] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > [ 129.813670] CR2: 0000000000000560 CR3: 0000000138b88000 CR4: 000000000= 0750ee0 > [ 129.820815] PKRU: 55555554 > [ 129.823551] Call Trace: > [ 129.826022] > [ 129.828154] ? show_regs+0x65/0x70 > [ 129.831599] ? __die+0x24/0x70 > [ 129.834683] ? page_fault_oops+0x160/0x480 > [ 129.838824] ? dev_printk_emit+0x83/0xb0 > [ 129.842797] ? do_user_addr_fault+0x2e2/0x680 > [ 129.847175] ? exc_page_fault+0x78/0x180 > [ 129.851143] ? asm_exc_page_fault+0x27/0x30 > [ 129.855353] ? drm_dp_mst_topology_put_port+0x19/0x170 [drm_display_he= lper] > [ 129.862354] drm_dp_add_payload_part1+0x85/0x100 [drm_display_helper] > [ 129.868832] intel_mst_pre_enable_dp+0x1ef/0x240 [i915] > [ 129.874170] intel_encoders_pre_enable+0x83/0xa0 [i915] > [ 129.879524] hsw_crtc_enable+0xbe/0x750 [i915] > [ 129.884095] intel_enable_crtc+0x68/0xa0 [i915] > [ 129.888752] skl_commit_modeset_enables+0x2c4/0x5d0 [i915] > [ 129.894365] intel_atomic_commit_tail+0x765/0x1070 [i915] > [ 129.899885] intel_atomic_commit+0x3ba/0x400 [i915] > [ 129.904892] drm_atomic_commit+0x96/0xd0 [drm] > [ 129.909405] ? __pfx___drm_printfn_info+0x10/0x10 [drm] > [ 129.914698] drm_atomic_helper_set_config+0x7e/0xc0 [drm_kms_helper] > [ 129.921102] drm_mode_setcrtc+0x5af/0x8d0 [drm] > [ 129.925695] ? __pfx_drm_mode_setcrtc+0x10/0x10 [drm] > [ 129.930810] drm_ioctl_kernel+0xc4/0x170 [drm] > [ 129.935317] drm_ioctl+0x2a4/0x520 [drm] > [ 129.939305] ? __pfx_drm_mode_setcrtc+0x10/0x10 [drm] > [ 129.944415] ? __fget_light+0xa5/0x110 > [ 129.948212] __x64_sys_ioctl+0x98/0xd0 > [ 129.951985] do_syscall_64+0x37/0x90 > [ 129.955581] entry_SYSCALL_64_after_hwframe+0x6e/0xd8 >=20 > Fixes: 5aa1dfcdf0a4 ("drm/mst: Refactor the flow for payload allocation/r= emovement") > Cc: Wayne Lin > Cc: Lyude Paul > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/= drm/display/drm_dp_mst_topology.c > index e04f87ff755ac..5f90860d49c34 100644 > --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c > +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c > @@ -3341,7 +3341,8 @@ int drm_dp_add_payload_part1(struct drm_dp_mst_topo= logy_mgr *mgr, > =09=09(!allocate || ret < 0) ? DRM_DP_MST_PAYLOAD_ALLOCATION_LOCAL : > =09=09=09=09=09=09=09=09DRM_DP_MST_PAYLOAD_ALLOCATION_DFP; > =20 > -=09drm_dp_mst_topology_put_port(port); > +=09if (port) > +=09=09drm_dp_mst_topology_put_port(port); > =20 > =09return ret; > } --=20 Cheers, Lyude Paul (she/her) Software Engineer at Red Hat