X.25 remove bkl in bind
Subsystems (3)
PATCH 2/4 X.25 remove bkl in bind
Accept updates socket values in 3 lines so wrapped with lock_sock.
Signed-off-by Andrew Hendry <[email protected]>
--- net/x25/af_x25.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
net/x25/af_x25.c +2 -2
@@ -688,7 +688,6 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)struct sockaddr_x25 *addr = (struct sockaddr_x25 *)uaddr;int len, i, rc =0 ; -lock_kernel ();if (!sock_flag (sk,SOCK_ZAPPED ) || addr_len !=sizeof (struct sockaddr_x25 ) || addr->sx25_family !=AF_X25 ) {
@@ -704,12 +703,13 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) } } +lock_sock (sk);x25_sk (sk)->source_addr = addr->sx25_addr;x25_insert_socket (sk);sock_reset_flag (sk,SOCK_ZAPPED ); +release_sock (sk);SOCK_DEBUG (sk,"x25_bind: socket is bound\n" ); out: -unlock_kernel ();return rc; }
Signature · 1 line
1.7.0.4
From: Andrew Hendry <[email protected]>
Date: Wed, 15 Sep 2010 09:31:38 +1000
Quoted 3 lines
Accept updates socket values in 3 lines so wrapped with
lock_sock.Signed-off-by Andrew Hendry <[email protected]>
Applied.