Merge lp:~swem/ubuntu/trusty/lshw/lp1471983 into lp:ubuntu/trusty-proposed/lshw

[Chen-Han Hsiao (Stanley)]

For bug 1471983, I also encounter this issue in Ubuntu OEM project.

This bug is fixed in https://github.com/lyonel/lshw/commit/d048d300b5daeb44887a7fc06ddeb120119cac8a

The issue in upstream: [lshw segfaults, with some 16GB USB-3 sticks from Patriot] http://www.ezix.org/project/ticket/653

I've made a patch to fix it.

[Marc Deslauriers (mdeslaur)]

Hi, thanks for the debdiff!

Two comments:

1- Could you please list both patches in the changelog along with a small description of what they accomplish?
2- While the "use-a-different-approach-for-scanning-SCSI-generic-d.patch" change seems to be included in 2.17 currently in vivid and wily, the "presumably-fix-653.patch" change is not. Could you please prepare debdiffs for Vivid and Wily?

Thanks!

review: Needs Fixing

[Chen-Han Hsiao (Stanley) (swem)]

@mdeslaur, thanks for review.

1. There are two patches added. I would add this description to changelog.

   [d048d30] presumably-fix-653.patch is for this segmentation fault issue.

   [b79f299] use-a-different-approach-for-scanning-SCSI-generic-d.patch use different approach to scan scsi devices to cover general devices. The functionality is the same. This patch need to be applied before d048d30.

2. I will add debdiff for vivid and wily

[lp:~swem/ubuntu/trusty/lshw/lp1471983]

33. By Chen-Han Hsiao (Stanley) on 2015-10-06

* [d048d30] Fix lshw crash issue on system with some USB-3 sticks (LP: #1471983)
* [b79f299] Use different approach for scanning SCSI generic devices.

Unmerged revisions

33. By Chen-Han Hsiao (Stanley) on 2015-10-06

* [d048d30] Fix lshw crash issue on system with some USB-3 sticks (LP: #1471983)
* [b79f299] Use different approach for scanning SCSI generic devices.

32. By Chen-Han Hsiao (Stanley) on 2015-09-03

Fix lshw crash issue on system with some USB-3 sticks (LP: #1471983)

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-28 15:00:23 +0000
+++ debian/changelog	2015-10-06 02:29:16 +0000
@@ -1,3 +1,10 @@
+lshw (02.16-2ubuntu1.4) trusty-proposed; urgency=medium
+
+  * [d048d30] Fix lshw crash issue on system with some USB-3 sticks (LP: #1471983)
+  * [b79f299] Use different approach for scanning SCSI generic devices.
+
+ -- Chen-Han Hsiao (Stanley) <[e-mail]>  Wed, 19 Aug 2015 11:58:11 +0800
+
 lshw (02.16-2ubuntu1.3) trusty-proposed; urgency=medium
 
   * Backport cpuinfo support for aarch64 (LP: #1485086)
 
=== added file 'debian/patches/presumably-fix-653.patch'
--- debian/patches/presumably-fix-653.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/presumably-fix-653.patch	2015-10-06 02:29:16 +0000
@@ -0,0 +1,30 @@
+From d048d300b5daeb44887a7fc06ddeb120119cac8a Mon Sep 17 00:00:00 2001
+From: Lyonel Vincent <[e-mail]>
+Date: Sun, 13 Jul 2014 11:21:59 +0000
+Subject: [PATCH] (presumably) fix #653
+
+git-svn-id: http://ezix.org/source/packages/lshw/development@2535 811e2811-9fd9-0310-a116-b6e8ac943c8b
+---
+ src/core/scsi.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/scsi.cc b/src/core/scsi.cc
+index ed059cb..d85fcc8 100644
+--- a/src/core/scsi.cc
++++ b/src/core/scsi.cc
+@@ -481,9 +481,9 @@ hwNode & node)
+   memset(rsp_buff, 0, sizeof(rsp_buff));
+   if (do_inq(sg_fd, 0, 1, 0x80, rsp_buff, MX_ALLOC_LEN, 0))
+   {
+-    len = rsp_buff[3];
+-    if (len > 0)
+-      node.setSerial(hw::strip(string(rsp_buff + 4, len)));
++    char _len = rsp_buff[3];
++    if (_len > 0)
++      node.setSerial(hw::strip(string(rsp_buff + 4, _len)));
+   }
+ 
+   memset(rsp_buff, 0, sizeof(rsp_buff));
+-- 
+1.9.1
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2015-08-28 15:00:23 +0000
+++ debian/patches/series	2015-10-06 02:29:16 +0000
@@ -17,3 +17,5 @@
 ddr3-device-tree-support.patch
 Do-not-brutally-merge-NICs-in-the-same-PCI-function-.patch
 cpuinfo-arm-aarch64-support.patch
+presumably-fix-653.patch
+use-a-different-approach-for-scanning-SCSI-generic-d.patch
 
=== added file 'debian/patches/use-a-different-approach-for-scanning-SCSI-generic-d.patch'
--- debian/patches/use-a-different-approach-for-scanning-SCSI-generic-d.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/use-a-different-approach-for-scanning-SCSI-generic-d.patch	2015-10-06 02:29:16 +0000
@@ -0,0 +1,120 @@
+From b79f299319f61bc80e8d38e61631cfee7521a729 Mon Sep 17 00:00:00 2001
+From: lyonel <lyonel@811e2811-9fd9-0310-a116-b6e8ac943c8b>
+Date: Wed, 13 Mar 2013 20:52:25 +0000
+Subject: [PATCH] use a different approach for scanning SCSI generic devices
+ (`/dev/sg*`) to fix #541 (thanks to Wayne Boyer)
+
+git-svn-id: http://ezix.org/source/packages/lshw/development@2518 811e2811-9fd9-0310-a116-b6e8ac943c8b
+---
+ src/core/scsi.cc | 45 ++++++++++++++++++++++++---------------------
+ 1 file changed, 24 insertions(+), 21 deletions(-)
+
+diff --git a/src/core/scsi.cc b/src/core/scsi.cc
+index 926ae06..ed059cb 100644
+--- a/src/core/scsi.cc
++++ b/src/core/scsi.cc
+@@ -29,7 +29,7 @@
+ 
+ __ID("@(#) $Id$");
+ 
+-#define SG_X "/dev/sg%d"
++#define SG_X "/dev/sg*"
+ #define SG_MAJOR 21
+ 
+ #ifndef SCSI_IOCTL_GET_PCI
+@@ -653,10 +653,9 @@ static bool atapi(const hwNode & n)
+ }
+ 
+ 
+-static bool scan_sg(int sg,
+-hwNode & n)
++static void scan_sg(hwNode & n)
+ {
+-  char buffer[20];
++  int sg;
+   int fd = -1;
+   My_sg_scsi_id m_id;
+   char slot_name[64];                             // should be 16 but some 2.6 kernels require 32 bytes
+@@ -665,22 +664,30 @@ hwNode & n)
+   hwNode *parent = NULL;
+   int emulated = 0;
+   bool ghostdeventry = false;
++  size_t j;
++  glob_t entries;
+ 
+-  snprintf(buffer, sizeof(buffer), SG_X, sg);
++  if(glob(SG_X, 0, NULL, &entries) == 0)
++  {
++    for(j=0; j < entries.gl_pathc; j++)
++    {
++      sg = strtol(strpbrk(entries.gl_pathv[j], "0123456789"), NULL, 10);
+ 
+-  ghostdeventry = !exists(buffer);
++      ghostdeventry = !exists(entries.gl_pathv[j]);
+ 
+-  if(ghostdeventry) mknod(buffer, (S_IFCHR | S_IREAD), MKDEV(SG_MAJOR, sg));
+-  fd = open(buffer, OPEN_FLAG | O_NONBLOCK);
+-  if(ghostdeventry) unlink(buffer);
++      if(ghostdeventry)
++        mknod(entries.gl_pathv[j], (S_IFCHR | S_IREAD), MKDEV(SG_MAJOR, sg));
++      fd = open(entries.gl_pathv[j], OPEN_FLAG | O_NONBLOCK);
++      if(ghostdeventry)
++        unlink(entries.gl_pathv[j]);
+   if (fd < 0)
+-    return false;
++        continue;
+ 
+   memset(&m_id, 0, sizeof(m_id));
+   if (ioctl(fd, SG_GET_SCSI_ID, &m_id) < 0)
+   {
+     close(fd);
+-    return true;                                  // we failed to get info but still hope we can continue
++        continue;        // we failed to get info but still hope we can continue
+   }
+ 
+   emulated = 0;
+@@ -773,11 +780,8 @@ hwNode & n)
+   if (!parent)
+     parent = n.addChild(hwNode("scsi", hw::storage));
+ 
+-  if (!parent)
++  if (parent)
+   {
+-    close(fd);
+-    return true;
+-  }
+ 
+   if(parent->getBusInfo() == "")
+     parent->setBusInfo(guessBusInfo(hw::strip(slot_name)));
+@@ -789,10 +793,12 @@ hwNode & n)
+     parent->addCapability("emulated", "Emulated device");
+   }
+   parent->addChild(device);
++  }
+ 
+   close(fd);
+-
+-  return true;
++    }
++    globfree(&entries);
++  }
+ }
+ 
+ 
+@@ -889,12 +895,9 @@ static bool scan_hosts(hwNode & node)
+ 
+ bool scan_scsi(hwNode & n)
+ {
+-  int i = 0;
+-
+   scan_devices();
+ 
+-  while (scan_sg(i, n))
+-    i++;
++  scan_sg(n);
+ 
+   scan_hosts(n);
+ 
+-- 
+1.9.1
+