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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F115C433F5 for ; Tue, 23 Nov 2021 19:36:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238157AbhKWTjW (ORCPT ); Tue, 23 Nov 2021 14:39:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:20865 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236048AbhKWTjK (ORCPT ); Tue, 23 Nov 2021 14:39:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637696160; 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=rZfv1IAB1L4OKPDv7Z7zl3z7pjV3ugHQdTctCyaDB7o=; b=QwryxxP27AkmZ0u8hNazhVijs7Y63O7OG8tElYLU8XTZBFYMx5ELvNWL551TsgQWw2kuTP ouGUG89dNVp5+6cjOxGACj3JjDODWHkh9fGvWJ1A9XAg6vV3r+TLlO3a1qeMbdNiwhQ1QL E756sjRykyPSsCX2vtStEQ7yFNgOcrc= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-209-N-SW8vLBPxuLqfrHEeaLZA-1; Tue, 23 Nov 2021 14:35:58 -0500 X-MC-Unique: N-SW8vLBPxuLqfrHEeaLZA-1 Received: by mail-qk1-f198.google.com with SMTP id o19-20020a05620a22d300b0046754380e8aso168268qki.13 for ; Tue, 23 Nov 2021 11:35:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:organization:user-agent:mime-version :content-transfer-encoding; bh=rZfv1IAB1L4OKPDv7Z7zl3z7pjV3ugHQdTctCyaDB7o=; b=iQILq2xBL+W9Qx//tGoBToWHMVAvTJsibCSlC75F5rcYOI/sYeT7JYd7Fl6LhsGhMC bduxaAZXvRQgY2eediE2JYgLtdCw9m59TjhhJVD/nu/HkbzdcDEu3gzHrbcve7M1SLzm yzfSbclkjmZieOsfxZ0Zw2VNz62Z1ZrPt0tfMzfnM/o3k2bk+Cp2FDIcZbUG8wPwIkYR lkH+c5PL4PbjDgtUR4l16d2H2tCC92TEFdJ/Wc1bXTdm4nJgGJIvDSF40v5gkCt+in4J 9yVI/VrTJCeH8M5QekALMzpYAVERug/9AJ12UIWSCAocwGUzZedWuZWcZmH8arjQFZRt cfnA== X-Gm-Message-State: AOAM533/+QNGZTgWQvmhw1GkUGauZ4KIBqz1cd/Ff8ISfMQzNAmchAoQ i080xyys+jmz+9Dbwi6V9t6Tlc6iVtxSznIppKvvd6ds8F6R1/aSlIhA8vXdAgfwYtFp4JhAGqR Wp5aBXk5Ds3PM26YLzGsw3NQP X-Received: by 2002:a05:622a:13c9:: with SMTP id p9mr9530978qtk.47.1637696158308; Tue, 23 Nov 2021 11:35:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJwd9aJm8SZb+wfUFsxDgSU42rVqDIpUUlYw//me57YbMeMFl74fEpjtGIzlLmPaOts6c7+/Mg== X-Received: by 2002:a05:622a:13c9:: with SMTP id p9mr9530939qtk.47.1637696158082; Tue, 23 Nov 2021 11:35:58 -0800 (PST) Received: from [192.168.8.138] (pool-96-230-249-157.bstnma.fios.verizon.net. [96.230.249.157]) by smtp.gmail.com with ESMTPSA id m15sm6726097qkp.76.2021.11.23.11.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 11:35:57 -0800 (PST) Message-ID: <4dd933d333194ff8a676fcafdd5c9ef19f002c92.camel@redhat.com> Subject: Re: [PATCH] drm/nouveau/acr: fix a couple NULL vs IS_ERR() checks From: Lyude Paul To: Dan Carpenter , Ben Skeggs Cc: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Date: Tue, 23 Nov 2021 14:35:55 -0500 In-Reply-To: <20211118111314.GB1147@kili> References: <20211118111314.GB1147@kili> Organization: Red Hat Inc. Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 (3.42.1-1.fc35) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reviewed-by: Lyude Paul Will push this to drm-misc in a bit On Thu, 2021-11-18 at 14:13 +0300, Dan Carpenter wrote: > The nvkm_acr_lsfw_add() function never returns NULL.  It returns error > pointers on error. > > Fixes: 22dcda45a3d1 ("drm/nouveau/acr: implement new subdev to replace > "secure boot"") > Signed-off-by: Dan Carpenter > --- >  drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c | 6 ++++-- >  drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c | 6 ++++-- >  2 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c > b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c > index cdb1ead26d84..82b4c8e1457c 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gm200.c > @@ -207,11 +207,13 @@ int >  gm200_acr_wpr_parse(struct nvkm_acr *acr) >  { >         const struct wpr_header *hdr = (void *)acr->wpr_fw->data; > +       struct nvkm_acr_lsfw *lsfw; >   >         while (hdr->falcon_id != WPR_HEADER_V0_FALCON_ID_INVALID) { >                 wpr_header_dump(&acr->subdev, hdr); > -               if (!nvkm_acr_lsfw_add(NULL, acr, NULL, (hdr++)->falcon_id)) > -                       return -ENOMEM; > +               lsfw = nvkm_acr_lsfw_add(NULL, acr, NULL, (hdr++)- > >falcon_id); > +               if (IS_ERR(lsfw)) > +                       return PTR_ERR(lsfw); >         } >   >         return 0; > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c > b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c > index fb9132a39bb1..fd97a935a380 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/acr/gp102.c > @@ -161,11 +161,13 @@ int >  gp102_acr_wpr_parse(struct nvkm_acr *acr) >  { >         const struct wpr_header_v1 *hdr = (void *)acr->wpr_fw->data; > +       struct nvkm_acr_lsfw *lsfw; >   >         while (hdr->falcon_id != WPR_HEADER_V1_FALCON_ID_INVALID) { >                 wpr_header_v1_dump(&acr->subdev, hdr); > -               if (!nvkm_acr_lsfw_add(NULL, acr, NULL, (hdr++)->falcon_id)) > -                       return -ENOMEM; > +               lsfw = nvkm_acr_lsfw_add(NULL, acr, NULL, (hdr++)- > >falcon_id); > +               if (IS_ERR(lsfw)) > +                       return PTR_ERR(lsfw); >         } >   >         return 0; -- Cheers, Lyude Paul (she/her) Software Engineer at Red Hat