X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=d3174af7994cc8937fd1ca1df9d92948f0ba5238;hb=936e57208c8e651be0f3dee6cfc635d719410100;hp=2792bf832c7ea2866a6accbe3b82b191eaa406f4;hpb=4dc604b496f388e6896d46bb02d109103c316e4f;p=petitboot diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 2792bf8..d3174af 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include @@ -177,7 +178,8 @@ int pb_protocol_boot_option_len(const struct boot_option *opt) 4 + optional_strlen(opt->icon_file) + 4 + optional_strlen(opt->boot_image_file) + 4 + optional_strlen(opt->initrd_file) + - 4 + optional_strlen(opt->boot_args); + 4 + optional_strlen(opt->boot_args) + + sizeof(opt->is_default); } int pb_protocol_boot_len(const struct boot_command *boot) @@ -226,6 +228,9 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt, pos += pb_protocol_serialise_string(pos, opt->initrd_file); pos += pb_protocol_serialise_string(pos, opt->boot_args); + *(bool *)pos = opt->is_default; + pos += sizeof(bool); + assert(pos <= buf + buf_len); (void)buf_len; @@ -421,6 +426,10 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt, if (read_string(opt, &pos, &len, &opt->boot_args)) goto out; + if (len < sizeof(bool)) + goto out; + opt->is_default = *(bool *)(pos); + rc = 0; out: