[v2,1/1] media: ccs: Clean up parsed CCS static data on parse failure

Commit Message

Sakari Ailus Dec. 3, 2024, 1:20 p.m. UTC

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.

Reported-by: David Heidelberg <[e-mail]>
Fixes: a6b396f410b1 ("media: ccs: Add CCS static data parser library")
Cc: [e-mail]
Signed-off-by: Sakari Ailus <[e-mail]>
---
since v1:

- Add a necessary header and fix a typo.

 drivers/media/i2c/ccs/ccs-data.c | 2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/drivers/media/i2c/ccs/ccs-data.c b/drivers/media/i2c/ccs/ccs-data.c
index 9d42137f4799..0afdc73ead16 100644
--- a/drivers/media/i2c/ccs/ccs-data.c
+++ b/drivers/media/i2c/ccs/ccs-data.c
@@ -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"
 
@@ -974,6 +975,7 @@  int ccs_data_parse(struct ccs_data_container *ccsdata, const void *data,
 
 out_free:
 	kvfree(bin.base);
+	memset(ccsdata, 0, sizeof(*ccsdata));
 
 	return rval;
 }