X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffile.c;h=a52b664e8900c6e789764c696f5d4e61ab9fab0d;hp=debf7f42b87e8d87244c5623fd736038be24f2bf;hb=3cbe90093acba116c5fc46beaf50f74c7c8a1b69;hpb=a7e2774dc319f3a64ae9b612a428f488a60d2721;ds=sidebyside

diff --git a/second/file.c b/second/file.c
index debf7f4..a52b664 100644
--- a/second/file.c
+++ b/second/file.c
@@ -186,7 +186,6 @@ enum dhcp_options {
      DHCP_PAD = 0,
      DHCP_NETMASK = 1,
      DHCP_ROUTERS = 3,
-     DHCP_DNS = 6,
      DHCP_END = 255,
 };
 
@@ -218,13 +217,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
 {
@@ -671,6 +675,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);