From 367593e7b602fd490baf22a26887c09877e75c14 Mon Sep 17 00:00:00 2001 From: Alison Schofield Date: Thu, 3 Mar 2022 16:54:23 -0800 Subject: [PATCH 145/217] 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/20220304005423.1054282-1-alison.schofield@intel.com Fixes: 46564977afb7 ("cxl/list: Add decoder support") Signed-off-by: Alison Schofield Signed-off-by: Vishal Verma --- cxl/lib/libcxl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c index f111d86..1782f42 100644 --- 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; } -- 2.27.0