Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 90c27297a9bfb8ea11c0e3f73ad90c4c66e8501e

Authored by andrew hendry
Committed by David S. Miller
1 parent 25aa4efe4f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

X.25 remove bkl in bind 

Accept updates socket values in 3 lines so wrapped with lock_sock.

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -688,7 +688,6 @@
688 688 struct sockaddr_x25 *addr = (struct sockaddr_x25 *)uaddr;
689 689 int len, i, rc = 0;
690 690  
691   - lock_kernel();
692 691 if (!sock_flag(sk, SOCK_ZAPPED) ||
693 692 addr_len != sizeof(struct sockaddr_x25) ||
694 693 addr->sx25_family != AF_X25) {
695 694  
696 695  
... ... @@ -704,12 +703,13 @@
704 703 }
705 704 }
706 705  
  706 + lock_sock(sk);
707 707 x25_sk(sk)->source_addr = addr->sx25_addr;
708 708 x25_insert_socket(sk);
709 709 sock_reset_flag(sk, SOCK_ZAPPED);
  710 + release_sock(sk);
710 711 SOCK_DEBUG(sk, "x25_bind: socket is bound\n");
711 712 out:
712   - unlock_kernel();
713 713 return rc;
714 714 }
715 715