Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-CC: debian-kernel@lists.debian.org

iotop bug #644616 needs to be fixed in stable because the elevant change
in Linux has been added to the 2.6.32 longterm tree, which the Debian
Linux kernel team intends[1] to add to the next Debian stable point
release. The change in Linux addresses a security issue (CVE-2011-2494)
by removing access to the taskstats interface for non-root users.
Unfortunately iotop relies on this file and therefore it can only run as
root. With the debdiff below iotop will output a friendly message
instead of crashing with a Python traceback.

     1. http://lists.debian.org/1323828773.2825.166.camel@deadeye

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+iotop (0.4-2+squeeze1) stable; urgency=low
+
+  * Backport patch to give a helpful error instead of crashing when Linux
+    denies permission to read the taskstats files (Closes: #644616)
+
+ -- Paul Wise <p...@debian.org>  Wed, 14 Dec 2011 14:33:20 +0800
+
 iotop (0.4-2) unstable; urgency=low
 
   * Correct bug number in the changelog for previous version.
--- a/debian/patches/0001-Explain-that-iotop-now-requires-root.patch
+++ b/debian/patches/0001-Explain-that-iotop-now-requires-root.patch
@@ -0,0 +1,33 @@
+From: Guillaume Chazarain <guic...@gmail.com>
+Date: Sat, 15 Oct 2011 18:39:32 +0200
+Origin: upstream, 
http://repo.or.cz/w/iotop.git/commitdiff/635b5838e95ed85767434207e463173fd91b6040
+Bug-Debian: http://bugs.debian.org/644616
+Subject: Explain that iotop now requires root.
+ https://lkml.org/lkml/2011/10/1/170
+ 
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=1a51410abe7d0ee4b1d112780f46df87d3621043
+--- a/iotop/ui.py
++++ b/iotop/ui.py
+@@ -446,10 +446,19 @@
+     ui.run()
+ 
+ def run_iotop(options):
+-    if options.batch:
+-        return run_iotop_window(None, options)
+-    else:
+-        return curses.wrapper(run_iotop_window, options)
++    try:
++        if options.batch:
++            return run_iotop_window(None, options)
++        else:
++            return curses.wrapper(run_iotop_window, options)
++    except OSError, e:
++        if e.errno == errno.EPERM:
++            print >> sys.stderr, e
++            print >> sys.stderr, ('iotop requires root or the NET_ADMIN '
++                                  'capability.')
++            sys.exit(1)
++        else:
++            raise
+ 
+ #
+ # Profiling
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Do-not-report-requirements-that-are-available.patch
 0002-Document-the-requirement-for-CONFIG_VM_EVENT_COUNTER.patch
+0001-Explain-that-iotop-now-requires-root.patch
 
-- 
bye,
pabs

http://wiki.debian.org/PaulWise

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to