| Message ID | 20180724132719.GA32237@embeddedor.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/nouveau/secboot/acr: fix memory leak | expand |
Hi all, Friendly ping! Who can take this? Thanks -- Gustavo On 07/24/2018 08:27 AM, Gustavo A. R. Silva wrote: > In case memory resources for *bl_desc* were allocated, release > them before return. > > Addresses-Coverity-ID: 1472021 ("Resource leak") > Fixes: 0d466901552a ("drm/nouveau/secboot/acr: Remove VLA usage") > Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > --- > drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c > index d02e183..5c14d6a 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c > @@ -801,6 +801,7 @@ acr_r352_load(struct nvkm_acr *_acr, struct nvkm_falcon *falcon, > bl = acr->hsbl_unload_blob; > } else { > nvkm_error(_acr->subdev, "invalid secure boot blob!\n"); > + kfree(bl_desc); > return -EINVAL; > } > >
On 8/2/18 12:51 PM, Gustavo A. R. Silva wrote: > Hi all, > > Friendly ping! Who can take this? > > Thanks > -- > Gustavo > > On 07/24/2018 08:27 AM, Gustavo A. R. Silva wrote: >> In case memory resources for *bl_desc* were allocated, release >> them before return. >> >> Addresses-Coverity-ID: 1472021 ("Resource leak") >> Fixes: 0d466901552a ("drm/nouveau/secboot/acr: Remove VLA usage") >> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> >> --- >> drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c >> index d02e183..5c14d6a 100644 >> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c >> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c >> @@ -801,6 +801,7 @@ acr_r352_load(struct nvkm_acr *_acr, struct nvkm_falcon *falcon, >> bl = acr->hsbl_unload_blob; >> } else { >> nvkm_error(_acr->subdev, "invalid secure boot blob!\n"); >> + kfree(bl_desc); >> return -EINVAL; >> } >> >> Hi Gustavo, Seeing as how I've been working on this corner of Nouveau lately (don't ask, haha), I reviewed and also tested this. It looks good, you can add: Reviewed-by: John Hubbard <jhubbard@nvidia.com> thanks,
On Fri, Sep 7, 2018 at 8:02 PM, John Hubbard <jhubbard@nvidia.com> wrote: > On 8/2/18 12:51 PM, Gustavo A. R. Silva wrote: >> Hi all, >> >> Friendly ping! Who can take this? >> >> Thanks >> -- >> Gustavo >> >> On 07/24/2018 08:27 AM, Gustavo A. R. Silva wrote: >>> In case memory resources for *bl_desc* were allocated, release >>> them before return. >>> >>> Addresses-Coverity-ID: 1472021 ("Resource leak") >>> Fixes: 0d466901552a ("drm/nouveau/secboot/acr: Remove VLA usage") >>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> >>> --- >>> drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c >>> index d02e183..5c14d6a 100644 >>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c >>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c >>> @@ -801,6 +801,7 @@ acr_r352_load(struct nvkm_acr *_acr, struct nvkm_falcon *falcon, >>> bl = acr->hsbl_unload_blob; >>> } else { >>> nvkm_error(_acr->subdev, "invalid secure boot blob!\n"); >>> + kfree(bl_desc); >>> return -EINVAL; >>> } >>> >>> > > Hi Gustavo, > > Seeing as how I've been working on this corner of Nouveau lately (don't ask, haha), > I reviewed and also tested this. It looks good, you can add: > > Reviewed-by: John Hubbard <jhubbard@nvidia.com> Ben can you take this? Reviewed-by: Kees Cook <keescook@chromium.org> -Kees
On Fri, 14 Sep 2018 at 07:35, Kees Cook <keescook@chromium.org> wrote: > > On Fri, Sep 7, 2018 at 8:02 PM, John Hubbard <jhubbard@nvidia.com> wrote: > > On 8/2/18 12:51 PM, Gustavo A. R. Silva wrote: > >> Hi all, > >> > >> Friendly ping! Who can take this? > >> > >> Thanks > >> -- > >> Gustavo > >> > >> On 07/24/2018 08:27 AM, Gustavo A. R. Silva wrote: > >>> In case memory resources for *bl_desc* were allocated, release > >>> them before return. > >>> > >>> Addresses-Coverity-ID: 1472021 ("Resource leak") > >>> Fixes: 0d466901552a ("drm/nouveau/secboot/acr: Remove VLA usage") > >>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> > >>> --- > >>> drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 1 + > >>> 1 file changed, 1 insertion(+) > >>> > >>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c > >>> index d02e183..5c14d6a 100644 > >>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c > >>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c > >>> @@ -801,6 +801,7 @@ acr_r352_load(struct nvkm_acr *_acr, struct nvkm_falcon *falcon, > >>> bl = acr->hsbl_unload_blob; > >>> } else { > >>> nvkm_error(_acr->subdev, "invalid secure boot blob!\n"); > >>> + kfree(bl_desc); > >>> return -EINVAL; > >>> } > >>> > >>> > > > > Hi Gustavo, > > > > Seeing as how I've been working on this corner of Nouveau lately (don't ask, haha), > > I reviewed and also tested this. It looks good, you can add: > > > > Reviewed-by: John Hubbard <jhubbard@nvidia.com> > > Ben can you take this? > > Reviewed-by: Kees Cook <keescook@chromium.org> I've got it in my tree. Thanks! > > -Kees > > -- > Kees Cook > Pixel Security > _______________________________________________ > Nouveau mailing list > Nouveau@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/nouveau
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c index d02e183..5c14d6a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c @@ -801,6 +801,7 @@ acr_r352_load(struct nvkm_acr *_acr, struct nvkm_falcon *falcon, bl = acr->hsbl_unload_blob; } else { nvkm_error(_acr->subdev, "invalid secure boot blob!\n"); + kfree(bl_desc); return -EINVAL; }
In case memory resources for *bl_desc* were allocated, release them before return. Addresses-Coverity-ID: 1472021 ("Resource leak") Fixes: 0d466901552a ("drm/nouveau/secboot/acr: Remove VLA usage") Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> --- drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 1 + 1 file changed, 1 insertion(+)