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]> Signed-off-by: David S. Miller <[email protected]>
oleg-nesterov · Sep 15, 2010 · 90c2729 · 90c2729
1 parent 25aa4ef
commit 90c2729
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
@@ -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;
 }