device-mapper-multipath/fix_devt.patch
Benjamin Marzinski 4fa3700b25 Updated to latest upstream 0.4.8 code: multipath-tools-080804.tgz (git
commit id: eb87cbd0df8adf61d1c74c025f7326d833350f78) fixed 451817,
    456397 (scsi_id_change.patch), 457530 (config_space_fix.patch)
457589 (static_libaio.patch)
2008-08-20 21:48:41 +00:00

26 lines
779 B
Diff

Index: multipath-tools/libmultipath/discovery.c
===================================================================
--- multipath-tools.orig/libmultipath/discovery.c
+++ multipath-tools/libmultipath/discovery.c
@@ -252,7 +252,11 @@ devt2devname (char *devname, char *devt)
continue;
if ((major == tmpmaj) && (minor == tmpmin)) {
- sprintf(block_path, "/sys/block/%s", dev);
+ if (snprintf(block_path, FILE_NAME_SIZE, "/sys/block/%s", dev) >= FILE_NAME_SIZE) {
+ condlog(0, "device name %s is too long\n", dev);
+ fclose(fd);
+ return 1;
+ }
break;
}
}
@@ -270,6 +274,7 @@ devt2devname (char *devname, char *devt)
condlog(0, "sysfs entry %s is not a directory\n", block_path);
return 1;
}
+ basename(block_path, devname);
return 0;
}