[kernel] r19144 - in dists/sid/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Wed Jun 13 02:38:58 2012
New Revision: 19144

Log:
ethtool: allow ETHTOOL_GSSET_INFO for users

Added:
   dists/sid/linux/debian/patches/bugfix/all/ethtool-allow-ETHTOOL_GSSET_INFO-for-users.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Tue Jun 12 22:59:51 2012	(r19143)
+++ dists/sid/linux/debian/changelog	Wed Jun 13 02:38:58 2012	(r19144)
@@ -4,6 +4,7 @@
   * [ia64,powerpc] udeb: Add crc-itu-t to crc-modules; make
     firewire-core-modules depend on it (fixes FTBFS)
   * [arm,m68k,sh4] udeb: Build ipv6-modules
+  * ethtool: allow ETHTOOL_GSSET_INFO for users
   
   [ Aurelien Jarno ]
   * [mips,mipsel] udeb: Remove rivafb and nvidiafb.

Added: dists/sid/linux/debian/patches/bugfix/all/ethtool-allow-ETHTOOL_GSSET_INFO-for-users.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/all/ethtool-allow-ETHTOOL_GSSET_INFO-for-users.patch	Wed Jun 13 02:38:58 2012	(r19144)
@@ -0,0 +1,31 @@
+From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux at rere.qmqm.pl>
+Date: Sun, 22 Jan 2012 00:20:40 +0000
+Subject: ethtool: allow ETHTOOL_GSSET_INFO for users
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+commit f80400a26a2e8bff541de12834a1134358bb6642 upstream.
+
+Allow ETHTOOL_GSSET_INFO ethtool ioctl() for unprivileged users.
+ETHTOOL_GSTRINGS is already allowed, but is unusable without this one.
+
+Signed-off-by: Michał Mirosław <mirq-linux at rere.qmqm.pl>
+Acked-by: Ben Hutchings <bhutchings at solarflare.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/core/ethtool.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/core/ethtool.c b/net/core/ethtool.c
+index 921aa2b..369b418 100644
+--- a/net/core/ethtool.c
++++ b/net/core/ethtool.c
+@@ -1311,6 +1311,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
+ 	case ETHTOOL_GRXCSUM:
+ 	case ETHTOOL_GTXCSUM:
+ 	case ETHTOOL_GSG:
++	case ETHTOOL_GSSET_INFO:
+ 	case ETHTOOL_GSTRINGS:
+ 	case ETHTOOL_GTSO:
+ 	case ETHTOOL_GPERMADDR:

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Tue Jun 12 22:59:51 2012	(r19143)
+++ dists/sid/linux/debian/patches/series	Wed Jun 13 02:38:58 2012	(r19144)
@@ -326,3 +326,4 @@
 bugfix/all/macvtap-zerocopy-validate-vectors-before-building-sk.patch
 
 bugfix/all/KVM-Fix-buffer-overflow-in-kvm_set_irq.patch
+bugfix/all/ethtool-allow-ETHTOOL_GSSET_INFO-for-users.patch