This is a note to let you know that I've just added the patch titled
econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
econet-do-the-correct-cleanup-after-an-unprivileged-siocsifaddr.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From ae6c6401042f6046ba1d67255dee4d55584c8095 Mon Sep 17 00:00:00 2001
From: Nelson Elhage <[email protected]>
Date: Wed, 8 Dec 2010 10:13:55 -0800
Subject: econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.
From: Nelson Elhage <[email protected]>
[ Upstream commit f24b8bedf70c524775eabd51570c3fa7708a97b7 ]
We need to drop the mutex and do a dev_put, so set an error code and break like
the other paths, instead of returning directly.
Signed-off-by: Nelson Elhage <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/econet/af_econet.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -661,8 +661,10 @@ static int ec_dev_ioctl(struct socket *s
err = 0;
switch (cmd) {
case SIOCSIFADDR:
- if (!capable(CAP_NET_ADMIN))
- return -EPERM;
+ if (!capable(CAP_NET_ADMIN)) {
+ err = -EPERM;
+ break;
+ }
edev = dev->ec_ptr;
if (edev == NULL) {
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.36/econet-do-the-correct-cleanup-after-an-unprivileged-siocsifaddr.patch
queue-2.6.36/econet-fix-crash-in-aun_incoming.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
