Skip to content

Commit 90c2729

Browse files
AndrewHendrydavem330
authored andcommitted
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]>
1 parent 25aa4ef commit 90c2729

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/x25/af_x25.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,6 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
688688
struct sockaddr_x25 *addr = (struct sockaddr_x25 *)uaddr;
689689
int len, i, rc = 0;
690690

691-
lock_kernel();
692691
if (!sock_flag(sk, SOCK_ZAPPED) ||
693692
addr_len != sizeof(struct sockaddr_x25) ||
694693
addr->sx25_family != AF_X25) {
@@ -704,12 +703,13 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
704703
}
705704
}
706705

706+
lock_sock(sk);
707707
x25_sk(sk)->source_addr = addr->sx25_addr;
708708
x25_insert_socket(sk);
709709
sock_reset_flag(sk, SOCK_ZAPPED);
710+
release_sock(sk);
710711
SOCK_DEBUG(sk, "x25_bind: socket is bound\n");
711712
out:
712-
unlock_kernel();
713713
return rc;
714714
}
715715

0 commit comments

Comments
 (0)