Hello, Find attached updated patch for procps_3.3.9-9.
Regards, -- Hector Oron
From 5a34ff0a99a3c5e7ba4f7982d5de3d0dcc9e3045 Mon Sep 17 00:00:00 2001 From: Craig Small <csm...@enc.com.au> Date: Wed, 29 Jan 2014 22:22:11 +1100 Subject: [PATCH] Check for presence of disks in vmstat vmstat -d or vmstat -p would crash mysteriously under different circumstances. The problem was eventually tracked down to /sys not being mounted which meant is_disk() always returned false. The partition would then be attempted to be linked to a non-existent disk causing a segfault. vmstat will now not link to a disk if none exists. The change in testing will skip those tests when /sys/block doesn't exist. Many thanks to Daniel Schepler for his analysis and suggestions. Bug-Debian: http://bugs.debian.org/736628 --- proc/sysinfo.c | 7 +++++-- testsuite/vmstat.test/vmstat.exp | 22 +++++++++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) Index: procps-3.3.9/proc/sysinfo.c =================================================================== --- procps-3.3.9.orig/proc/sysinfo.c 2015-04-30 17:24:33.482103829 +0100 +++ procps-3.3.9/proc/sysinfo.c 2015-04-30 17:24:33.466103830 +0100 @@ -938,8 +938,11 @@ &(*partitions)[cPartition].writes, &(*partitions)[cPartition].requested_writes ); - (*partitions)[cPartition++].parent_disk = cDisk-1; - (*disks)[cDisk-1].partitions++; + + if (cDisk > 0) { + (*partitions)[cPartition++].parent_disk = cDisk-1; + (*disks)[cDisk-1].partitions++; + } } } Index: procps-3.3.9/testsuite/vmstat.test/vmstat.exp =================================================================== --- procps-3.3.9.orig/testsuite/vmstat.test/vmstat.exp 2015-04-30 17:24:33.482103829 +0100 +++ procps-3.3.9/testsuite/vmstat.test/vmstat.exp 2015-04-30 17:26:56.086099501 +0100 @@ -26,16 +26,23 @@ } set test "vmstat disk information (-d option)" -#spawn $vmstat -d -#expect_pass "$test" "^disk\[ -\]+reads\[ -\]+writes\[ -\]+IO\[ -\]+\\s+total\\s+merged\\s+sectors\\s+ms\\s+total\\s+merged\\s+sectors\\s+ms\\s+cur\\s+sec\\s+" -untested "$test" +if { [ file readable "/sys/block" ] == 0 } { + unsupported "$test /sys/block not readable" +} else { + spawn $vmstat -d + expect_pass "$test" "^disk\[ -\]+reads\[ -\]+writes\[ -\]+IO\[ -\]+\\s+total\\s+merged\\s+sectors\\s+ms\\s+total\\s+merged\\s+sectors\\s+ms\\s+cur\\s+sec\\s+" +} # Need a partition set diskstats [ exec cat /proc/diskstats ] -if [ regexp "\\s+\\d+\\s+\\d+\\s+\((?:hd|sd|vd)\[a-z\]\\d+\)\\s+\[0-9\]\[0-9\]+" $diskstats line partition == 1 ] { - set test "vmstat partition (using $partition)" - spawn $vmstat -p $partition - expect_pass "$test" "^${partition}\\s+reads" +if { [ file readable "/sys/block" ] == 0 } { + unsupported "vmstat partition /sys/block not readable" } else { - unsupported "vmstat partition (cannot find partition)" + if [ regexp "\\s+\\d+\\s+\\d+\\s+\(\[a-z\]+\\d+\)\\s+\[0-9\]\[0-9\]+" $diskstats line partition == 1 ] { + set test "vmstat partition (using $partition)" + spawn $vmstat -p $partition + expect_pass "$test" "^${partition}\\s+reads" + } else { + unsupported "vmstat partition (cannot find partition)" + } }
signature.asc
Description: Digital signature
