/*
- * Copy the string from source to dest till newline or comma(,) is seen
+ * Copy the string from source to dest until the end of string or comma is seen
* in the source.
* Move source and dest pointers respectively.
* Returns pointer to the start of the string that has just been copied.
while (**source != ',' && **source != '\0')
*(*dest)++ = *(*source)++;
if (**source != '\0')
- *(*source)++;
+ (void)*(*source)++;
**dest = '\0';
- *(*dest)++;
+ (void)*(*dest)++;
return ret;
}
DHCP_PAD = 0,
DHCP_NETMASK = 1,
DHCP_ROUTERS = 3,
- DHCP_DNS = 6,
DHCP_END = 255,
};
* it's malformed. :( */
while (options[i] != DHCP_END) {
__u8 tag = options[i++], len;
- __u32 value;
+ __u32 value = 0;
if (tag == DHCP_PAD)
continue;
len = options[i++];
- memcpy(&value, &options[i], len);
+ /* Clamp the maxium length of the memcpy() to the right size for
+ * value. */
+ if (len > sizeof(value))
+ memcpy(&value, &options[i], sizeof(value));
+ else
+ memcpy(&value, &options[i], len);
#if DEBUG
{
/*
* Check netinfo for ipv4 parameters and add them to the fspec iff the
* fspec has no existing value.
- *
- * Returns 1 on success, 0 on failure.
*/
-static int
+static void
extract_netinfo_args(struct boot_fspec_t *result)
{
struct bootp_packet *packet;
/* Check to see if we can get the [scyg]iaddr fields from netinfo */
packet = prom_get_netinfo();
if (!packet)
- return 0;
+ return;
DEBUG_F("We have a boot packet\n");
DEBUG_F(" siaddr = <%x>\n", packet->siaddr);
result->giaddr = ipv4_to_str(packet->siaddr);
DEBUG_F("Forcing giaddr to siaddr <%s>\n", result->giaddr);
}
-
- return 1;
}
/*
ret = extract_ipv6_args(imagepath, result);
else
ret = extract_ipv4_args(imagepath, result);
- ret |= extract_netinfo_args(result);
+ extract_netinfo_args(result);
DEBUG_F("ipv6 = <%d>\n", result->is_ipv6);
DEBUG_F("siaddr = <%s>\n", result->siaddr);
case FILE_DEVICE_BLOCK:
DEBUG_F("device is a block device\n");
return file_block_open(file, spec, spec->part);
+ case FILE_DEVICE_ISCSI:
+ DEBUG_F("device is a iSCSI device\n");
+ return file_block_open(file, spec, spec->part);
case FILE_DEVICE_NET:
DEBUG_F("device is a network device\n");
return file_net_open(file, spec);