From 7b7d8abcb04d956e38339378bf6914b935199b73 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 2 Jan 2026 18:32:34 +0100 Subject: [PATCH] fabrics: add missing default context assignment The config line parser wants to access the default fabrics configuration for every connection attempt. Thus assign the pointer to the helper struct to avoid NULL pointer access. Reported-by: Martin George Signed-off-by: Daniel Wagner --- fabrics.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fabrics.c b/fabrics.c index b2beaeb0b8..6c846e7a14 100644 --- a/fabrics.c +++ b/fabrics.c @@ -172,7 +172,7 @@ static int setup_common_context(struct nvmf_context *fctx, struct fabric_args *fa); struct cb_fabrics_data { - struct nvme_fabrics_config *defcfg; + struct nvme_fabrics_config *cfg; nvme_print_flags_t flags; char *raw; char **argv; @@ -281,7 +281,7 @@ static int cb_parser_next_line(struct nvmf_context *fctx, void *user_data) OPT_FLAG("persistent", 'p', &persistent, "persistent discovery connection"), OPT_FLAG("force", 0, &force, "Force persistent discovery controller creation")); - memcpy(&cfg, cfd->defcfg, sizeof(cfg)); + memcpy(&cfg, cfd->cfg, sizeof(cfg)); next: if (fgets(line, sizeof(line), cfd->f) == NULL) return -EOF; @@ -549,6 +549,7 @@ int fabrics_discovery(const char *desc, int argc, char **argv, bool connect) } struct cb_fabrics_data dld = { + .cfg = &cfg, .flags = flags, .raw = raw, };