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

Open Source and information security mailing list archives

Message-ID: <20110107191036.GG32717@windriver.com>
Date:	Fri, 7 Jan 2011 14:10:36 -0500
From:	Paul Gortmaker <paul.gortmaker@...driver.com>
To:	Greg KH <gregkh@...e.de>
Cc:	linux-kernel@...r.kernel.org, stable@...nel.org,
	Nelson Elhage <nelhage@...lice.com>,
	"David S. Miller" <davem@...emloft.net>, akpm@...ux-foundation.org,
	torvalds@...ux-foundation.org, stable-review@...nel.org,
	alan@...rguk.ukuu.org.uk
Subject: Re: [stable] [069/152] econet: Do the correct cleanup after an
 unprivileged SIOCSIFADDR.

[[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@...lice.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@...lice.com>
> Signed-off-by: David S. Miller <davem@...emloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh@...e.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@...ux.kernel.org
> http://linux.kernel.org/mailman/listinfo/stable
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives