netdev - Re: fix broken locking in x25 ioctl error paths

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1372432775.3301.285.camel@edumazet-glaptop>
Date:	Fri, 28 Jun 2013 08:19:35 -0700
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	Dave Jones <davej@...hat.com>
Cc:	netdev@...r.kernel.org
Subject: Re: fix broken locking in x25 ioctl error paths

On Fri, 2013-06-28 at 11:14 -0400, Dave Jones wrote:
> Two of the x25 ioctl cases have error paths that break out of the function without
> unlocking the socket, leading to this warning:
> 
> 
> ================================================
> [ BUG: lock held when returning to user space! ]
> 3.10.0-rc7+ #36 Not tainted
> ------------------------------------------------
> trinity-child2/31407 is leaving the kernel with locks still held!
> 1 lock held by trinity-child2/31407:
>  #0:  (sk_lock-AF_X25){+.+.+.}, at: [<ffffffffa024b6da>] x25_ioctl+0x8a/0x740 [x25]
> 
> Signed-off-by: Dave Jones <davej@...hat.com>
> 
> diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
> index 37ca969..2c1e633 100644
> --- a/net/x25/af_x25.c
> +++ b/net/x25/af_x25.c
> @@ -1584,10 +1584,11 @@ out_cud_release:
>  		rc = -EINVAL;
>  		lock_sock(sk);
>  		if (sk->sk_state != TCP_CLOSE)
> -			break;
> +			goto out_callaccpt_release;
>  		clear_bit(X25_ACCPT_APPRV_FLAG, &x25->flags);
> -		release_sock(sk);
>  		rc = 0;
> +out_callaccpt_release:
> +		release_sock(sk);
>  		break;
>  	}

Or :

lock_sock(sk);
if (sk->sk_state == TCP_CLOSE) {
    clear_bit(X25_ACCPT_APPRV_FLAG, &x25->flags);
    rc = 0;
}
release_sock(sk);
break;


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html