[kernel] r16279 - in dists/sid/linux-2.6/debian: . patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Mon Sep 13 21:17:48 2010
New Revision: 16279

Log:
ethtool: allow non-netadmin to query settings (see #520724)

Added:
   dists/sid/linux-2.6/debian/patches/features/all/ethtool-allow-non-netadmin-to-query-settings.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/22

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Sep 13 19:27:28 2010	(r16278)
+++ dists/sid/linux-2.6/debian/changelog	Mon Sep 13 21:17:48 2010	(r16279)
@@ -55,6 +55,7 @@
   * ipheth: remove incorrect devtype of WWAN
   * ALSA: emux: Add trivial compat ioctl handler (Closes: #596478)
   * hostap_pci: set dev->base_addr during probe (Closes: #595802)
+  * ethtool: allow non-netadmin to query settings (see #520724)
 
   [ Bastian Blank ]
   * Use Breaks instead of Conflicts.

Added: dists/sid/linux-2.6/debian/patches/features/all/ethtool-allow-non-netadmin-to-query-settings.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/ethtool-allow-non-netadmin-to-query-settings.patch	Mon Sep 13 21:17:48 2010	(r16279)
@@ -0,0 +1,38 @@
+From: stephen hemminger <shemminger at vyatta.com>
+Date: Mon, 23 Aug 2010 10:24:18 +0000
+Subject: [PATCH] ethtool: allow non-netadmin to query settings
+
+commit 0fdc100bdc4b7ab61ed632962c76dfe539047296 upstream.
+
+The SNMP daemon uses ethtool to determine the speed of
+network interfaces. This fails on Debian (and probably elsewhere)
+because for security SNMP daemon runs as non-root user (snmp).
+
+Note: A similar patch was rejected previously because of a concern about
+the possibility that on some hardware querying the ethtool settings
+requires access to the PHY and could slow the machine down.  But the
+security risk of requiring SNMP daemon (and related services)
+to run as root far out weighs the risk of denial-of-service.
+
+Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+[bwh: Adjust context for 2.6.32]
+---
+ net/core/ethtool.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/net/core/ethtool.c b/net/core/ethtool.c
+index d2c4da5..970eb98 100644
+--- a/net/core/ethtool.c
++++ b/net/core/ethtool.c
+@@ -1423,6 +1423,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
+ 
+ 	/* Allow some commands to be done by anyone */
+ 	switch(ethcmd) {
++	case ETHTOOL_GSET:
+ 	case ETHTOOL_GDRVINFO:
+ 	case ETHTOOL_GMSGLVL:
+ 	case ETHTOOL_GCOALESCE:
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Mon Sep 13 19:27:28 2010	(r16278)
+++ dists/sid/linux-2.6/debian/patches/series/22	Mon Sep 13 21:17:48 2010	(r16279)
@@ -125,3 +125,4 @@
 + bugfix/all/ipheth-remove-incorrect-devtype-to-WWAN.patch
 + bugfix/all/ALSA-emux-Add-trivial-compat-ioctl-handler.patch
 + bugfix/all/hostap_pci-set-dev-base_addr-during-probe.patch
++ features/all/ethtool-allow-non-netadmin-to-query-settings.patch