]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
drm/nouveau/secboot/gm20b: initialize pointer in gm20b_secboot_new()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 8 Jan 2020 05:46:01 +0000 (08:46 +0300)
committerPaolo Pisati <paolo.pisati@canonical.com>
Mon, 24 Feb 2020 15:19:56 +0000 (16:19 +0100)
BugLink: https://bugs.launchpad.net/bugs/1864488
[ Upstream commit 3613a9bea95a1470dd42e4ed1cc7d86ebe0a2dc0 ]

We accidentally set "psb" which is a no-op instead of "*psb" so it
generates a static checker warning.  We should probably set it before
the first error return so that it's always initialized.

Fixes: 923f1bd27bf1 ("drm/nouveau/secboot/gm20b: add secure boot support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c

index df8b919dcf09bc4b6470afa898fed69a1221c531..ace6fefba428007841adfd72c1082ddba697c907 100644 (file)
@@ -108,6 +108,7 @@ gm20b_secboot_new(struct nvkm_device *device, int index,
        struct gm200_secboot *gsb;
        struct nvkm_acr *acr;
 
+       *psb = NULL;
        acr = acr_r352_new(BIT(NVKM_SECBOOT_FALCON_FECS) |
                           BIT(NVKM_SECBOOT_FALCON_PMU));
        if (IS_ERR(acr))
@@ -116,10 +117,8 @@ gm20b_secboot_new(struct nvkm_device *device, int index,
        acr->optional_falcons = BIT(NVKM_SECBOOT_FALCON_PMU);
 
        gsb = kzalloc(sizeof(*gsb), GFP_KERNEL);
-       if (!gsb) {
-               psb = NULL;
+       if (!gsb)
                return -ENOMEM;
-       }
        *psb = &gsb->base;
 
        ret = nvkm_secboot_ctor(&gm20b_secboot, acr, device, index, &gsb->base);