Re: [stable] [069/152] econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.

Paul Gortmaker
2011-01-07T19:11:33Z

[[stable] [069/152] econet: Do the correct cleanup after an unprivileged SIOCSIFADDR.] On 05/01/2011 (Wed 16:22) Greg KH wrote:

> 2.6.36-stable review patch. If anyone has any objections, please let us know.
>
> ------------------
>
>
> From: Nelson Elhage <nelhage@ksplice.com>
>
> [ Upstream commit f24b8bedf70c524775eabd51570c3fa7708a97b7 ]

I think the upstream # got mangled somehow. Looking at the tree, I
think the upstream is 0c62fc6dd02c8d793c75ae76a9b6881fc36388ad.

The ID listed currently gives me a "bad object".

Thanks,
Paul.

>
> 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) {
>
>
> _______________________________________________
> stable mailing list
> stable@linux.kernel.org
> http://linux.kernel.org/mailman/listinfo/stable