cxl/list: tidy the error path in add_cxl_decoder()

Static analysis reported this NULL pointer dereference during cleanup on error in add_cxl_decoder(). Link: https://lore.kernel.org/r/[email protected] Fixes: 4656497 ("cxl/list: Add decoder support") Signed-off-by: Alison Schofield <[email protected]> Signed-off-by: Vishal Verma <[email protected]>
pmem · Mar 4, 2022 · 367593e · 367593e
1 parent 057ca6f
commit 367593e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c
@@ -919,11 +919,11 @@ static void *add_cxl_decoder(void *parent, int id, const char *cxldecoder_base)
 
 	decoder->dev_path = strdup(cxldecoder_base);
 	if (!decoder->dev_path)
-		goto err;
+		goto err_decoder;
 
 	decoder->dev_buf = calloc(1, strlen(cxldecoder_base) + 50);
 	if (!decoder->dev_buf)
-		goto err;
+		goto err_decoder;
 	decoder->buf_len = strlen(cxldecoder_base) + 50;
 
 	sprintf(path, "%s/start", cxldecoder_base);
@@ -1024,10 +1024,12 @@ static void *add_cxl_decoder(void *parent, int id, const char *cxldecoder_base)
 	list_add(&port->decoders, &decoder->list);
 
 	return decoder;
-err:
+
+err_decoder:
 	free(decoder->dev_path);
 	free(decoder->dev_buf);
 	free(decoder);
+err:
 	free(path);
 	return NULL;
 }