From 917f7aa880a7c6ab08991ae0c969d0489ba48845 Mon Sep 17 00:00:00 2001 From: Brandon Bergren Date: Sun, 10 Jun 2018 13:21:58 -0500 Subject: Fix pb-discover segfaults caused by list corruption. I was seeing list corruption and segfaults in pb-discover on my Talos II when using both yaboot and kboot config files on the same device. My assumption is that discover_context_add_boot_option() was being called on the same pointer more than once. So, null the pointer right after the call. The ownership was transferred anyway so the parsers should not keep it around. Signed-off-by: Brandon Bergren Signed-off-by: Samuel Mendoza-Jonas --- discover/yaboot-parser.c | 1 + 1 file changed, 1 insertion(+) (limited to 'discover/yaboot-parser.c') diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c index 42db95b..b06248f 100644 --- a/discover/yaboot-parser.c +++ b/discover/yaboot-parser.c @@ -172,6 +172,7 @@ static void yaboot_finish(struct conf_context *conf) state->opt->option->is_default = true; discover_context_add_boot_option(conf->dc, state->opt); + state->opt = NULL; } static void yaboot_process_pair(struct conf_context *conf, const char *name, -- cgit v1.2.1