| | Date | Wed, 05 Jan 2011 16:22:48 -0800 | | From | Greg KH <> | | Subject | [069/152] econet: Do the correct cleanup after an unprivileged SIOCSIFADDR. |
| |
2.6.36-stable review patch. If anyone has any objections, please let us know.
------------------
From: Nelson Elhage <nelhage@ksplice.com>
[ 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 <nelhage@ksplice.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- 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) {
|