media: ccs: Clean up parsed CCS static data on parse failure
BugLink: https://bugs.launchpad.net/bugs/2114239
commit da73efa8e675a2b58f1c7ae61201acfe57714bf7 upstream.
ccs_data_parse() releases the allocated in-memory data structure when the
parser fails, but it does not clean up parsed metadata that is there to
help access the actual data. Do that, in order to return the data
structure in a sane state.
Fixes: a6b396f410 ("media: ccs: Add CCS static data parser library")
Cc: stable@vger.kernel.org
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Mehdi Djait <mehdi.djait@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Noah Wager <noah.wager@canonical.com>
Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
b0fc3622d9
commit
61deea1c3f
@@ -10,6 +10,7 @@
|
||||
#include <linux/limits.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/string.h>
|
||||
|
||||
#include "ccs-data-defs.h"
|
||||
|
||||
@@ -948,15 +949,15 @@ int ccs_data_parse(struct ccs_data_container *ccsdata, const void *data,
|
||||
|
||||
rval = __ccs_data_parse(&bin, ccsdata, data, len, dev, verbose);
|
||||
if (rval)
|
||||
return rval;
|
||||
goto out_cleanup;
|
||||
|
||||
rval = bin_backing_alloc(&bin);
|
||||
if (rval)
|
||||
return rval;
|
||||
goto out_cleanup;
|
||||
|
||||
rval = __ccs_data_parse(&bin, ccsdata, data, len, dev, false);
|
||||
if (rval)
|
||||
goto out_free;
|
||||
goto out_cleanup;
|
||||
|
||||
if (verbose && ccsdata->version)
|
||||
print_ccs_data_version(dev, ccsdata->version);
|
||||
@@ -965,15 +966,16 @@ int ccs_data_parse(struct ccs_data_container *ccsdata, const void *data,
|
||||
rval = -EPROTO;
|
||||
dev_dbg(dev, "parsing mismatch; base %p; now %p; end %p\n",
|
||||
bin.base, bin.now, bin.end);
|
||||
goto out_free;
|
||||
goto out_cleanup;
|
||||
}
|
||||
|
||||
ccsdata->backing = bin.base;
|
||||
|
||||
return 0;
|
||||
|
||||
out_free:
|
||||
out_cleanup:
|
||||
kvfree(bin.base);
|
||||
memset(ccsdata, 0, sizeof(*ccsdata));
|
||||
|
||||
return rval;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user