X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffile.c;h=02b187231716e318964dc77681637d000ad2a35a;hp=debf7f42b87e8d87244c5623fd736038be24f2bf;hb=0298b541149eca4c30749085694526a0040d0982;hpb=a7e2774dc319f3a64ae9b612a428f488a60d2721

diff --git a/second/file.c b/second/file.c
index debf7f4..02b1872 100644
--- a/second/file.c
+++ b/second/file.c
@@ -88,7 +88,7 @@ static char * is_valid_ipv4_str(char *str)
 
 
 /*
- * 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.
@@ -104,9 +104,9 @@ scopy(char **dest, char **source)
      while (**source != ',' && **source != '\0')
 	  *(*dest)++ = *(*source)++;
      if (**source != '\0')
-	  *(*source)++;
+	  (void)*(*source)++;
      **dest = '\0';
-     *(*dest)++;
+     (void)*(*dest)++;
      return ret;
 }
 
@@ -163,9 +163,14 @@ extract_ipv4_args(char *imagepath, struct boot_fspec_t *result)
 	  args++; /* If comma(,) is not immediately followed by ':' then go past the , */
 
      /*
-      * read the arguments in order: siaddr,filename,ciaddr,giaddr,
+      * read the arguments in order: vtag,siaddr,filename,ciaddr,giaddr,
       * bootp-retries,tftp-retries,addl_prameters
       */
+     if ((tmp = strstr(imagepath, "vtag=")) != NULL) {
+	result->vtag = scopy(&str, &tmp);
+	args = tmp;
+     }
+
      result->siaddr = is_valid_ipv4_str(scopy(&str, &args));
      result->file = scopy(&str, &args);
      result->ciaddr = is_valid_ipv4_str(scopy(&str, &args));
@@ -186,7 +191,6 @@ enum dhcp_options {
      DHCP_PAD = 0,
      DHCP_NETMASK = 1,
      DHCP_ROUTERS = 3,
-     DHCP_DNS = 6,
      DHCP_END = 255,
 };
 
@@ -218,13 +222,18 @@ extract_vendor_options(struct bootp_packet *packet, struct boot_fspec_t *result)
       *         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
 {
@@ -327,6 +336,9 @@ extract_ipv6_args(char *imagepath, struct boot_fspec_t *result)
      if ((tmp = strstr(imagepath, "dhcpv6=")) != NULL)
 	result->dhcpv6 = scopy(&str, &tmp);
 
+     if ((tmp = strstr(imagepath, "vtag=")) != NULL)
+	result->vtag = scopy(&str, &tmp);
+
      if ((tmp = strstr(imagepath, "ciaddr=")) != NULL)
 	result->ciaddr = scopy(&str, &tmp);
 
@@ -671,6 +683,9 @@ int open_file(struct boot_fspec_t* spec, struct boot_file_t* file)
      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);