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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A861C433F5 for ; Fri, 1 Oct 2021 22:42:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3323A61AA4 for ; Fri, 1 Oct 2021 22:42:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230427AbhJAWny (ORCPT ); Fri, 1 Oct 2021 18:43:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230360AbhJAWny (ORCPT ); Fri, 1 Oct 2021 18:43:54 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DA4AC061775 for ; Fri, 1 Oct 2021 15:42:09 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id e15so44210654lfr.10 for ; Fri, 01 Oct 2021 15:42:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Ye+Ig/O23GoJ8Iq7iv3h8SxIDcT6+17KTEH2/egvfXA=; b=kuxvhMFSDeYBLvpTecKb2W/0DEQVCCzuQ8WydZmEuAyKLsJ/t2j2sq+9gJcCBN4sHb 69RW+i+IQpE4EdrUeUA+5aoZr61mrZSzsYFPMcX+eKMeYm3i4F7V7L84Bxh9NguysWKP LsvMmbD2FlTKjLIIRCFyuX/HG7jEH4uhRuVqKVFdkviOXKlHvly1pESBR/NQ+WBHumNB BNzN1/ZftsFCcEt5anj6+Csv5jx84fQFS0bfJ+70XXqNEC+gOHHot0pGxjqLZfzuDwOE UEnXxs1QNW1rT5WJao9TDCqK/SdE9dXUklowGzFcTXHTko7Uqa4+g3kGaq+kBN2+0iXb 4uBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Ye+Ig/O23GoJ8Iq7iv3h8SxIDcT6+17KTEH2/egvfXA=; b=TLWoVu/0eJPyAndC2XZn2Vy3ENfYJ2YpAEVVl4yShG0UeHxfsOtq1xSJn2A5EPSfWK Pas3TMdrbYYakWAJKOiyD9a7aoxg9Cpd+DetDojr8rysDj0n+V9f2fbnR81OXUORpbDI o/JztLULBoc/qc2KyvWxHHgV/Lf7YoLpQQ37VzHsSMn3TC3DpA7Qo+o7UhJidiXVqUCL e49bdR2LtyOvhjDueQMBmU230HcynF/0/z8qNOyMivmG7BKnUCLC8MQXMRP88/N7dmM7 RUDM64l7lR+wtKOlo6JZGUMVF7zXOHwpR+hTum/JfZ9tz41aApVbuVCR6kT7yxtNd9Mh 9mwg== X-Gm-Message-State: AOAM530kiaX2Q73BR0xk1ZgTe4f66WLx15xpgTrn9otUVtxHwRoBVyZm zDQZKS8j9H8UBReGOln+Tm0loA== X-Google-Smtp-Source: ABdhPJzSjmTgZF2x7IHWeD8LUXrXxoktmZ4B7IHcP4t5nkYVl1sKDlVVSXKFABEJeRK7+vfZnUasxQ== X-Received: by 2002:a05:6512:228a:: with SMTP id f10mr556331lfu.619.1633128127810; Fri, 01 Oct 2021 15:42:07 -0700 (PDT) Received: from [192.168.1.211] ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id o21sm24068lfo.52.2021.10.01.15.42.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Oct 2021 15:42:07 -0700 (PDT) Subject: Re: [PATCH] drm/msm: prevent NULL dereference in msm_gpu_crashstate_capture() To: Tim Gardner , dri-devel@lists.freedesktop.org Cc: Rob Clark , Sean Paul , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20210929162554.14295-1-tim.gardner@canonical.com> From: Dmitry Baryshkov Message-ID: <7d251b1c-1054-6fde-602f-35eed4ac1cfe@linaro.org> Date: Sat, 2 Oct 2021 01:42:06 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20210929162554.14295-1-tim.gardner@canonical.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 29/09/2021 19:25, Tim Gardner wrote: > Coverity complains of a possible NULL dereference: > > CID 120718 (#1 of 1): Dereference null return value (NULL_RETURNS) > 23. dereference: Dereferencing a pointer that might be NULL state->bos when > calling msm_gpu_crashstate_get_bo. [show details] > 301 msm_gpu_crashstate_get_bo(state, submit->bos[i].obj, > 302 submit->bos[i].iova, submit->bos[i].flags); > > Fix this by employing the same state->bos NULL check as is used in the next > for loop. > > Cc: Rob Clark > Cc: Sean Paul > Cc: David Airlie > Cc: Daniel Vetter > Cc: linux-arm-msm@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Cc: freedreno@lists.freedesktop.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Tim Gardner Reviewed-by: Dmitry Baryshkov > --- > drivers/gpu/drm/msm/msm_gpu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c > index 8a3a592da3a4..2c46cd968ac4 100644 > --- a/drivers/gpu/drm/msm/msm_gpu.c > +++ b/drivers/gpu/drm/msm/msm_gpu.c > @@ -296,7 +296,7 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, > state->bos = kcalloc(nr, > sizeof(struct msm_gpu_state_bo), GFP_KERNEL); > > - for (i = 0; i < submit->nr_bos; i++) { > + for (i = 0; state->bos && i < submit->nr_bos; i++) { > if (should_dump(submit, i)) { > msm_gpu_crashstate_get_bo(state, submit->bos[i].obj, > submit->bos[i].iova, submit->bos[i].flags); > -- With best wishes Dmitry