Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp6739558rwb; Mon, 5 Dec 2022 17:24:01 -0800 (PST) X-Google-Smtp-Source: AA0mqf7TR9oiLgTm35hkjDO3LAlEHtb03K0a45oz2RPhjxHENvEbXEWDI1j1e/xd2FXjKZAUlYfl X-Received: by 2002:a17:906:7e57:b0:7c1:bb5:1937 with SMTP id z23-20020a1709067e5700b007c10bb51937mr493748ejr.251.1670289840782; Mon, 05 Dec 2022 17:24:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670289840; cv=none; d=google.com; s=arc-20160816; b=fyep/J5th3uT7OvFqZDrFDXQTDZf/t1hOBw7Ug9FcjLqXw9BdRSdReDFMgRGDJf5RF C8XemrtqGPKLFD1jhQP5z7yoUxwS1FEMngbKNbR99eZOKBN911xW30p1oWceDc1R5Wis NhAVd6gbbmgbMRLRG/qO2xkmPKh+QhWqSk5LavzMkoE1lwDHtWWUha/bC9YwhZOcTg+a 2RAqcYN4WONMNm/x/WD1gUQl4cajvYM4Bf4nQ3f3/fIV3M3z05wU1e3PB8IC0SfhcqbN JqjjdXw+5vdgv68ZOxNthYt9VZqgZS6cl/MmBVeiTuktliLRWsEecKDLPl7pOgLj15VS Lpdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=vrd7FfueKholXe98mvN6q0jU34zWpJgC+kcpoxaw4+4=; b=XTDHx2GOkN5Ev6izx9IrVh9dnI7DdjpZBiLahaJm1i7DsPTyjGD1kcO/7tXwno0DSC KSX/Bd6Qf2idJHpzyPCX+p3hxY/qCQsPZWHsszk43zMXMZ2i9YSkpGPz7def06HWbSkz wO3bSP98gJItJKNFWz/OsJxNGfZxB/Jjclrv4sQs0VNQZCfebpmOG08TZW3paHrgyN8C 4iKyiKGauOBFwf8k2/RyB9y9YAM+6zA1A35VwC1DLt150SRnLg0a33CXCUhWd5NJ0U9k ka2qfl2cvBPpb81Z/xSnKs/4O5Dhx9959tYb1cyKWXL6hQajFK+g49Ehy4Ar6UNu63/z xoUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=rH59W3VE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qf16-20020a1709077f1000b007c0c0d7c4c8si9650969ejc.44.2022.12.05.17.23.41; Mon, 05 Dec 2022 17:24:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@igalia.com header.s=20170329 header.b=rH59W3VE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233254AbiLFAjp (ORCPT + 79 others); Mon, 5 Dec 2022 19:39:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233171AbiLFAjW (ORCPT ); Mon, 5 Dec 2022 19:39:22 -0500 Received: from fanzine2.igalia.com (fanzine2.igalia.com [213.97.179.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0169D1EEE2 for ; Mon, 5 Dec 2022 16:37:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vrd7FfueKholXe98mvN6q0jU34zWpJgC+kcpoxaw4+4=; b=rH59W3VEdRciD0aYsAMpA9ER86 H3a2VLMFj6PeVvB9+jdkN6XxQDH10pGzSLhtVRnAmPlnA0aPTGyVpJXHrsFEoo6PpcDOU3BaCOlmS edQoUSbLXCGnFc3reFsmm0KyfDJpp6kIzd/Gs+Tg38U+dtgpF6ODApfCRauDJSSRqM+8vsMDcMlRd bGZhLoXLk3/87zPwf1ACoURW8V+3K+Dwj4jlIP/0pWsaddwPdR1W5X0r6D/ehvmldAM5IzZ+uxI+t 78maBxch5FCmBD+5hEhNmkLhFErUb3FY9w4gCUxG7ytigtQ2w2j8U39lXMRqBqnVks+MKwm1MIHLT zP/N23iA==; Received: from [177.34.169.227] (helo=[192.168.0.8]) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_128_GCM:128) (Exim) id 1p2Lxl-00FpTH-Bm; Tue, 06 Dec 2022 01:37:33 +0100 Message-ID: <44140361-33c3-ff97-b28f-64c26bf87d5c@igalia.com> Date: Mon, 5 Dec 2022 21:37:26 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH v2 1/2] drm/v3d: cleanup BOs properly when lookup_bos fails To: Melissa Wen , emma@anholt.net, airlied@gmail.com, daniel@ffwll.ch Cc: Thomas Zimmermann , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, kernel-dev@igalia.com References: <20221205135538.3545051-1-mwen@igalia.com> <20221205135538.3545051-2-mwen@igalia.com> Content-Language: en-US From: =?UTF-8?Q?Ma=c3=adra_Canal?= In-Reply-To: <20221205135538.3545051-2-mwen@igalia.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/5/22 10:55, Melissa Wen wrote: > When v3d_lookup_bos fails to `allocate validated BO pointers`, > job->bo_count was already set to args->bo_count, but job->bo points to > NULL. In this scenario, we must verify that job->bo is not NULL before > iterating on it to proper clean up a job. Also, drm_gem_object_put > already checks that the object passed is not NULL, doing the job->bo[i] > checker redundant. > > Signed-off-by: Melissa Wen Reviewed-by: Maíra Canal Best Regards, - Maíra Canal > --- > drivers/gpu/drm/v3d/v3d_gem.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c > index 96af1cb5202a..31a37572c11d 100644 > --- a/drivers/gpu/drm/v3d/v3d_gem.c > +++ b/drivers/gpu/drm/v3d/v3d_gem.c > @@ -363,11 +363,11 @@ v3d_job_free(struct kref *ref) > struct v3d_job *job = container_of(ref, struct v3d_job, refcount); > int i; > > - for (i = 0; i < job->bo_count; i++) { > - if (job->bo[i]) > + if (job->bo) { > + for (i = 0; i < job->bo_count; i++) > drm_gem_object_put(job->bo[i]); > + kvfree(job->bo); > } > - kvfree(job->bo); > > dma_fence_put(job->irq_fence); > dma_fence_put(job->done_fence);