summaryrefslogtreecommitdiffstats
path: root/discover
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-07-31 08:44:11 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-07-31 08:46:54 +0800
commit404c07fc44449be7b011d1961280ef9c96e0760d (patch)
tree44895f619b461a31d4251af5e68a4da887ff9450 /discover
parent37d865eb008f746a0b013557312c6b44c7236eb7 (diff)
downloadtalos-petitboot-404c07fc44449be7b011d1961280ef9c96e0760d.tar.gz
talos-petitboot-404c07fc44449be7b011d1961280ef9c96e0760d.zip
parser/yaboot: Fix check for image presence
In the cleanup of yaboot option state, 3fb8fb6fb, we change from checking opt->boot_image to opt, to indicate that we're parsing an image section. We missed one check, which is causing a segfault due to the null opt. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'discover')
-rw-r--r--discover/yaboot-parser.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index 3696abf..39fba63 100644
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-parser.c
@@ -175,7 +175,8 @@ static void yaboot_process_pair(struct conf_context *conf, const char *name,
return;
}
- if (!opt->boot_image) {
+ /* all other processing requires an image */
+ if (!opt) {
pb_log("%s: unknown name: %s\n", __func__, name);
return;
}
OpenPOWER on IntegriCloud