| From 7837d88c2545728189904b6f0167fac4fddb555d Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Wed, 8 Jan 2020 08:46:01 +0300 |
| Subject: [PATCH] drm/nouveau/secboot/gm20b: initialize pointer in |
| gm20b_secboot_new() |
| |
| commit 3613a9bea95a1470dd42e4ed1cc7d86ebe0a2dc0 upstream. |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c |
| index df8b919dcf09..ace6fefba428 100644 |
| --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c |
| +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c |
| @@ -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); |
| -- |
| 2.7.4 |
| |
