diff -u lshw-02.16/debian/control lshw-02.16/debian/control --- lshw-02.16/debian/control +++ lshw-02.16/debian/control @@ -1,7 +1,8 @@ Source: lshw Section: utils Priority: optional -Maintainer: Ghe Rivero +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ghe Rivero Build-Depends: debhelper (>> 6.0.0), libgtk2.0-dev, quilt, libsqlite3-dev Standards-Version: 3.9.4 diff -u lshw-02.16/debian/changelog lshw-02.16/debian/changelog --- lshw-02.16/debian/changelog +++ lshw-02.16/debian/changelog @@ -1,3 +1,9 @@ +lshw (02.16-2ubuntu1) UNRELEASED; urgency=medium + + * Disable /dev/mem access for SMBIOS on aarch64 systems (LP: #1284406) + + -- dann frazier Mon, 24 Feb 2014 19:28:23 -0700 + lshw (02.16-2) unstable; urgency=low * Closes: #525217 diff -u lshw-02.16/debian/patches/series lshw-02.16/debian/patches/series --- lshw-02.16/debian/patches/series +++ lshw-02.16/debian/patches/series @@ -14,0 +15 @@ +aarch64-disable-smbios-check.patch only in patch2: unchanged: --- lshw-02.16.orig/debian/patches/aarch64-disable-smbios-check.patch +++ lshw-02.16/debian/patches/aarch64-disable-smbios-check.patch @@ -0,0 +1,24 @@ +Description: Avoid trolling /dev/mem for SMBIOS on aarch64 + When lshw runs as superuser, it can crash aarch64 systems (kernel + oops) by accessing /dev/mem to look for the SMBIOS region. Since + SMBIOS is unlikely to exist in an aarch64 platform, simply disable + the DMI method. +Author: dann frazier +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lshw/+bug/1284406 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740034 +Forwarded: http://ezix.org/project/ticket/642 +Last-Update: 2014-03-07 + +Index: lshw-02.16/src/core/dmi.cc +=================================================================== +--- lshw-02.16.orig/src/core/dmi.cc 2014-02-24 18:38:37.382039999 -0700 ++++ lshw-02.16/src/core/dmi.cc 2014-02-24 18:39:51.062039999 -0700 +@@ -1751,7 +1751,7 @@ + u16 dmimaj = 0, dmimin = 0; + currentcpu = 0; + +-#if defined(__arm__) || defined (__hppa__) ++#if defined (__aarch64__) || defined(__arm__) || defined (__hppa__) + return false; // SMBIOS not supported on ARM and PA-RISC machines + #endif +