x25: Fix broken locking in ioctl error paths.
authorDave Jones <davej@redhat.com>
Fri, 28 Jun 2013 16:13:52 +0000 (12:13 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Jul 2013 01:15:25 +0000 (18:15 -0700)
commit4ccb93ce7439b63c31bc7597bfffd13567fa483d
tree77194fb01868c4a63e34a3b957d9b55f745be9e2
parentaec0a40a6f78843c0ce73f7398230ee5184f896d
x25: Fix broken locking in ioctl error paths.

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@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/x25/af_x25.c