Currently with '--wwn' flag, 128-bit wwns gets truncated and their last 3 hex-digits missing. Below is a comparison of wwn reported by lsscsi compared to wwn info at /dev/disk/by-id directory. % lsscsi -w 0:0:5:0 [0:0:5:0] disk 0x60050764008181941000000000000 /dev/sdad % ls -l /dev/disk/by-id/wwn-* lrwxrwxrwx. 1 root root 10 Oct 19 01:08 /dev/disk/by-id/wwn-0x600507640081819410000000000001b1 -> ../../sdad To fix this, the patch increases the size of member wwn of struct disk_wwn_node_entry to 35 chars to accommodate the extra '0x' prefix and null terminator. Also the size of the buffer wwn_str thats used to output wwn to the std-out is increased to match the corresponding member of disk_wwn_node_entry. Link: https://bugs.launchpad.net/ubuntu/+source/lsscsi/+bug/1636467 Link: https://bugzilla.redhat.com/show_bug.cgi?id=1387263 Cc: Jon Grimm <jon.grimm@xxxxxxxxxxxxx> Cc: Vipin K Parashar <vipin@xxxxxxxxxxxxxxxxxx> Cc: Ping Tian Han <pthan@xxxxxxxxxx> Cc: Gris Ge <fge@xxxxxxxxxx> Reported-by: Ping Tian Han <pthan@xxxxxxxxxx> Signed-off-by: Vaibhav Jain <vaibhav@xxxxxxxxxxxxxxxxxx> Reviewed-by: Gris Ge <fge@xxxxxxxxxx> --- src/lsscsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lsscsi.c b/src/lsscsi.c index 974b3f1..f20adcf 100644 --- a/src/lsscsi.c +++ b/src/lsscsi.c @@ -210,8 +210,8 @@ struct dev_node_list { static struct dev_node_list* dev_node_listhead = NULL; struct disk_wwn_node_entry { - char wwn[32]; - char disk_bname[12]; + char wwn[35]; /* '0x' + wwn<128-bit> + <null-terminator> */ + char disk_bname[12]; }; #define DISK_WWN_NODE_LIST_ENTRIES 16 @@ -2939,14 +2939,14 @@ one_sdev_entry(const char * dir_name, const char * devname, } if (wd[0]) { char dev_node[LMAX_NAME] = ""; - char wwn_str[34]; + char wwn_str[35]; enum dev_type typ; typ = (FT_BLOCK == non_sg.ft) ? BLK_DEV : CHR_DEV; if (get_wwn) { if ((BLK_DEV == typ) && get_disk_wwn(wd, wwn_str, sizeof(wwn_str))) - printf("%-30s ", wwn_str); + printf("%-34s ", wwn_str); else printf(" " " "); -- 2.9.3
