discover: check config.boot_device before setting a default

[petitboot] / lib / pb-protocol / pb-protocol.c

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 5a1cee7a417bc648e883a0c3020f0c42c640430d..67e1f9e91a04dbf52e3ffebecc0a2371feca35a4 100644 (file)
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -279,7 +279,9 @@ int pb_protocol_config_len(const struct config *config)
                len += 4 + optional_strlen(config->network.dns_servers[i]);
 
        len += 4;
-       len += config->n_boot_priorities * 4;
+       len += config->n_boot_priorities * 8;
+
+       len += 4 + optional_strlen(config->boot_device);
 
        return len;
 }
@@ -464,10 +466,16 @@ int pb_protocol_serialise_config(const struct config *config,
        *(uint32_t *)pos = __cpu_to_be32(config->n_boot_priorities);
        pos += 4;
        for (i = 0; i < config->n_boot_priorities; i++) {
-               *(uint32_t *)pos = __cpu_to_be32(config->boot_priorities[i].type);
+               *(uint32_t *)pos =
+                       __cpu_to_be32(config->boot_priorities[i].type);
+               pos += 4;
+               *(uint32_t *)pos =
+                       __cpu_to_be32(config->boot_priorities[i].priority);
                pos += 4;
        }
 
+       pos += pb_protocol_serialise_string(pos, config->boot_device);
+
        assert(pos <= buf + buf_len);
        (void)buf_len;
 
@@ -842,6 +850,7 @@ int pb_protocol_deserialise_config(struct config *config,
        unsigned int len, i, tmp;
        const char *pos;
        int rc = -1;
+       char *str;
 
        len = message->payload_len;
        pos = message->payload;
@@ -874,10 +883,9 @@ int pb_protocol_deserialise_config(struct config *config,
                        config->network.n_dns_servers);
 
        for (i = 0; i < config->network.n_dns_servers; i++) {
-               char *tmp;
-               if (read_string(config->network.dns_servers, &pos, &len, &tmp))
+               if (read_string(config->network.dns_servers, &pos, &len, &str))
                        goto out;
-               config->network.dns_servers[i] = tmp;
+               config->network.dns_servers[i] = str;
        }
 
        if (read_u32(&pos, &len, &config->n_boot_priorities))
@@ -886,11 +894,19 @@ int pb_protocol_deserialise_config(struct config *config,
                        config->n_boot_priorities);
 
        for (i = 0; i < config->n_boot_priorities; i++) {
+               if (read_u32(&pos, &len, &tmp))
+                       goto out;
+               config->boot_priorities[i].priority = (int)tmp;
                if (read_u32(&pos, &len, &tmp))
                        goto out;
                config->boot_priorities[i].type = tmp;
        }
 
+       if (read_string(config, &pos, &len, &str))
+               goto out;
+
+       config->boot_device = str;
+
        rc = 0;
 
 out: