Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp2735128ybx; Fri, 8 Nov 2019 08:36:09 -0800 (PST) X-Google-Smtp-Source: APXvYqwzoE+9QvqIvR+3VplYzsDybG9OfCd+yFm8xvFNqZzQolUjqKXeAfHizskGfLq6vlv0YAOh X-Received: by 2002:a17:906:3ec8:: with SMTP id d8mr9698179ejj.55.1573230969466; Fri, 08 Nov 2019 08:36:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573230969; cv=none; d=google.com; s=arc-20160816; b=qEmmg3y9cHyQq5ClDed1dhFznuDe/eTLBSGYHtetsnNTM03Ys6+jxbH3AuBvZm64Fg a75GoQnEvFsBCJiCfRsn/Xgndt/ubX0lHHfFx+McY5i9FMTSjR0pPLTkEFs4a0e54PT4 6JoX5AiJa5DP3AMtNxQ/LdDruTfk0b0VKiaCTrKh1YMtwaVkwXJPijn4ny75UxdLci3R EYm3g1z4PHUxjhjwbD2HOIAwQEJePb42KrfSOQMEB8KD004dL8dd7Zo+3c7uvXPcQG2l 8r7HXlUy1n6GDNjUHfY3FScCbrRfjgKyaC0g8jIZnWo+AS0HjqDJtg1Dnr2VqwWDiS4k KORQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=d12YzuQ4OOUJW5jPNwfT02SFHHJndjYuWq6ftUtWsrs=; b=ZnWN7JhnV7KAOem9K2X5yE3y2HnB7Xb/lVvteWK03NBIRF+WvVI4rN7VSAa6WoWCvc TCEQci7lBaAYANR59TBxG1xehNgpsY1yjEPHjEfzPGjeddHAxUemw0+EHAJPvUnEa1qv MNoAAienloQKsT5NuXpOQM8BEWX67g27h4jH8B6NFoxhFSjYqvezgoek0O2hhijuM0oq aH5ZKnsttHt/ScmKofyD/wMNwSALR1TksV4NPgNmBSuevq5HGrpiL/wZqHzRG9s1ypCt SiVTVJRSpVSYeKIYFh6YASwpzXdCqAl6xSWfcHXXTWtOmyWYkqbMLsKSTGZ/JeiswmGW O3qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="h/7Q83+Y"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m1si3918202ejd.305.2019.11.08.08.35.32; Fri, 08 Nov 2019 08:36:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="h/7Q83+Y"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726576AbfKHQdb (ORCPT + 99 others); Fri, 8 Nov 2019 11:33:31 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:52816 "EHLO mail-wm1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726039AbfKHQda (ORCPT ); Fri, 8 Nov 2019 11:33:30 -0500 Received: by mail-wm1-f48.google.com with SMTP id c17so6813961wmk.2; Fri, 08 Nov 2019 08:33:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=d12YzuQ4OOUJW5jPNwfT02SFHHJndjYuWq6ftUtWsrs=; b=h/7Q83+Y+UWeONi2+mS2jpHkFnqQbs0EGaw6F+I5lOb1idZNWlNQJcHE8VRqK+919v MJtnB2E5oqbrnqJseQ5n9vZCCaUb49lpaDtPF69tYDZHijCkW6Dd9PF/mEgCW/qop6oN nEnmBsv25XYLCW90WcfFX2H8QGXcPEcbMG/PeyiBvCpV1DGKagiOruvQ9Q6RvgEV9M7j EN8bHyLricAhahgyrOV/h6q4byTLh5jzYO8H7k55Di9zdlmE8EQNyFettwfOXZfHFm69 iDJpqa7iv1utUeG562OARQrbJLwRWcjOoblSjv1EE68R3Cbz2cA6pUdvo49sAIyY0FOs IS1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=d12YzuQ4OOUJW5jPNwfT02SFHHJndjYuWq6ftUtWsrs=; b=SPSWlj50OmbVAVUZKJNcCrbL/8x/l6FLINzXItBL9QH8O/QE/s11VcgSmYoLgaRxLX iD3hB2bue1jVuX5nnkrs8BDT8aQ5Y2oCsDXquhmoi4WEHGj9W83uwmwLGAOUXlwQweLo j6lCSSshmakKnLpbpIsrmDy86cH3InEwDfaCqR2svyCm524rXEaV5W/5eNvpduxRfwFS YxYSRKHuZ1s5gGHj7bOqxDcMsp/cOqV4NLmON8jjU/DUT1KxIOXSzHPpboYkzLVPXx5F Xo+2anAn9Z8D4+UaFEgbp73KY1mxp4cxR0PaWvL6MKcJPpBEUH+GVxBJxYu2vXaA/Nk/ Dang== X-Gm-Message-State: APjAAAXG0xlNR6+tpAEbPJWxr8e5nMkRzr553zUZNaCF7knZhykp9bDw I7U5VaK2Gf21uxrRUl+bxAkL71zTA5fhyp3Do1Y= X-Received: by 2002:a7b:c408:: with SMTP id k8mr9513409wmi.67.1573230808946; Fri, 08 Nov 2019 08:33:28 -0800 (PST) MIME-Version: 1.0 References: <20191108143814.118856-1-colin.king@canonical.com> <7155ecfc-1aff-002d-9cc6-e097525e7cb6@amd.com> In-Reply-To: <7155ecfc-1aff-002d-9cc6-e097525e7cb6@amd.com> From: Alex Deucher Date: Fri, 8 Nov 2019 11:33:16 -0500 Message-ID: Subject: Re: [PATCH][next] drm/amd/display: fix dereference of pointer aconnector when it is null To: Mikita Lipski Cc: Colin King , "Wentland, Harry" , "Li, Sun peng (Leo)" , "Deucher, Alexander" , "Koenig, Christian" , "Zhou, David(ChunMing)" , David Airlie , Daniel Vetter , Lyude Paul , "Kazlauskas, Nicholas" , "Lipski, Mikita" , "amd-gfx@lists.freedesktop.org" , "dri-devel@lists.freedesktop.org" , "kernel-janitors@vger.kernel.org" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Applied. thanks! Alex On Fri, Nov 8, 2019 at 9:42 AM Mikita Lipski wrote: > > Thanks! > > Reviewed-by: Mikita Lipski > > On 08.11.2019 9:38, Colin King wrote: > > From: Colin Ian King > > > > Currently pointer aconnector is being dereferenced by the call to > > to_dm_connector_state before it is being null checked, this could > > lead to a null pointer dereference. Fix this by checking that > > aconnector is null before dereferencing it. > > > > Addresses-Coverity: ("Dereference before null check") > > Fixes: 5133c6241d9c ("drm/amd/display: Add MST atomic routines") > > Signed-off-by: Colin Ian King > > --- > > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c > > index e3cda6984d28..72e677796a48 100644 > > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c > > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c > > @@ -193,12 +193,11 @@ bool dm_helpers_dp_mst_write_payload_allocation_table( > > * that blocks before commit guaranteeing that the state > > * is not gonna be swapped while still in use in commit tail */ > > > > - dm_conn_state = to_dm_connector_state(aconnector->base.state); > > - > > - > > if (!aconnector || !aconnector->mst_port) > > return false; > > > > + dm_conn_state = to_dm_connector_state(aconnector->base.state); > > + > > mst_mgr = &aconnector->mst_port->mst_mgr; > > > > if (!mst_mgr->mst_state) > > > > -- > Thanks, > Mikita Lipski > mikita.lipski@amd.com > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel