Message ID | 1476752972-11285-1-git-send-email-trini@konsulko.com |
---|---|
State | Accepted |
Commit | 0317724e6c5db6229dbdc03dd9c9b68a559973fe |
Delegated to: | Simon Glass |
Headers | show |
On 17 October 2016 at 19:09, Tom Rini <trini@konsulko.com> wrote: > Now that we free resources in sandbox_fs_ls Coverity is letting us know > that in some cases we might leak. So in case of error we should still > let os_dirent_free free anything that was allocated. > > Fixes: 86167089b71c ("sandbox/fs: Free memory allocated by os_dirent_ls") > Reported-by: Coverity (CID: 153450) > Cc: Stefan Brüns <stefan.bruens@rwth-aachen.de> > Cc: Simon Glass <sjg@chromium.org> > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > fs/sandbox/sandboxfs.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 17 October 2016 at 19:54, Simon Glass <sjg@chromium.org> wrote: > On 17 October 2016 at 19:09, Tom Rini <trini@konsulko.com> wrote: >> Now that we free resources in sandbox_fs_ls Coverity is letting us know >> that in some cases we might leak. So in case of error we should still >> let os_dirent_free free anything that was allocated. >> >> Fixes: 86167089b71c ("sandbox/fs: Free memory allocated by os_dirent_ls") >> Reported-by: Coverity (CID: 153450) >> Cc: Stefan Brüns <stefan.bruens@rwth-aachen.de> >> Cc: Simon Glass <sjg@chromium.org> >> Signed-off-by: Tom Rini <trini@konsulko.com> >> --- >> fs/sandbox/sandboxfs.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm/next, thanks
diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c index cd10fd6845fb..ca8026133708 100644 --- a/fs/sandbox/sandboxfs.c +++ b/fs/sandbox/sandboxfs.c @@ -88,15 +88,16 @@ int sandbox_fs_ls(const char *dirname) ret = os_dirent_ls(dirname, &head); if (ret) - return ret; + goto out; for (node = head; node; node = node->next) { printf("%s %10lu %s\n", os_dirent_get_typename(node->type), node->size, node->name); } +out: os_dirent_free(head); - return 0; + return ret; } int sandbox_fs_exists(const char *filename)
Now that we free resources in sandbox_fs_ls Coverity is letting us know that in some cases we might leak. So in case of error we should still let os_dirent_free free anything that was allocated. Fixes: 86167089b71c ("sandbox/fs: Free memory allocated by os_dirent_ls") Reported-by: Coverity (CID: 153450) Cc: Stefan Brüns <stefan.bruens@rwth-aachen.de> Cc: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com> --- fs/sandbox/sandboxfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)