[kexec-tools/f15] Resolves: Bz 710744

Neil Horman nhorman at fedoraproject.org
Mon Jun 6 19:50:21 UTC 2011


commit 51f4e6791cadef100f7c7491159321fe59e1c5b1
Author: Neil Horman <nhorman at tuxdriver.com>
Date:   Mon Jun 6 15:49:50 2011 -0400

    Resolves: Bz 710744

 kexec-tools.spec |    5 ++++-
 mkdumprd         |    5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 3e0ab39..84a05a7 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
 Name: kexec-tools
 Version: 2.0.0 
-Release: 43%{?dist}
+Release: 44%{?dist}
 License: GPLv2
 Group: Applications/System
 Summary: The kexec/kdump userspace component.
@@ -282,6 +282,9 @@ done
 
 
 %changelog
+* Mon Jun 05 2011 Neil Horman <nhorman at redhat.com> - 2.0.0-44
+- Fixed misuse of readlink after directory change (bz 710744)
+
 * Thu May 19 2011 Neil Horman <nhorman at tuxdriver.com> - 2.0.0-43
 - Fix ppc bulid break
 
diff --git a/mkdumprd b/mkdumprd
index b95b69f..22c4d0e 100644
--- a/mkdumprd
+++ b/mkdumprd
@@ -364,13 +364,14 @@ findstoragedriverinsys () {
         [ "$PWD" = "/sys" ] && return
         cd ..
     done
-    cd $(readlink ./device)
+    devname=$(readlink ./device)
+    cd $devname
     while [ ! -f modalias ]; do
         [ "$PWD" = "/sys/devices" ] && return
         cd ..
     done
 
-    modalias=$(cat $(find /sys/devices -name modalias | grep $(basename $(readlink ./device))))
+    modalias=$(cat $(find /sys/devices -name modalias | grep grep $(basename $devname)))
 
     for driver in $(modprobe --set-version $kernel --show-depends $modalias 2>/dev/null| awk '{ print gensub(".*/","","g",$2) }') ; do
         findmodule ${driver%%.ko}


More information about the scm-commits mailing list