diff options
| author | Richard Chang <dickchang@google.com> | 2016-09-27 16:30:04 +0000 |
|---|---|---|
| committer | Richard Chang <dickchang@google.com> | 2016-09-27 17:21:04 -0700 |
| commit | aa4f73e9f7e92e71e0de9b9dd3223f8b7d61a016 (patch) | |
| tree | 0bbf0e9f84c6247eec3f6cef91d232586e2babc9 | |
| parent | a5e1799d953f868b951ee18469c7aa899af0b7f8 (diff) | |
Revert "Revert "BACKPORT: Bluetooth: Fix potential NULL dereference in RFCOMM bind callback""android-wear-7.0.0_r0.2
This reverts commit f26172291a294ef86761dd60b696fda61ace3ace.
Change-Id: I7501511d1e82a5c426b31392abead14d32240c86
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 7ca014daa5ab..280c66fb3c0b 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -328,15 +328,19 @@ static int rfcomm_sock_create(struct net *net, struct socket *sock, static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len) { - struct sockaddr_rc *sa = (struct sockaddr_rc *) addr; + struct sockaddr_rc sa; struct sock *sk = sock->sk; - int err = 0; - - BT_DBG("sk %p %pMR", sk, &sa->rc_bdaddr); + int len, err = 0; if (!addr || addr->sa_family != AF_BLUETOOTH) return -EINVAL; + memset(&sa, 0, sizeof(sa)); + len = min_t(unsigned int, sizeof(sa), addr_len); + memcpy(&sa, addr, len); + + BT_DBG("sk %p %pMR", sk, &sa.rc_bdaddr); + lock_sock(sk); if (sk->sk_state != BT_OPEN) { @@ -351,12 +355,12 @@ static int rfcomm_sock_bind(struct socket *sock, struct sockaddr *addr, int addr write_lock(&rfcomm_sk_list.lock); - if (sa->rc_channel && __rfcomm_get_sock_by_addr(sa->rc_channel, &sa->rc_bdaddr)) { + if (sa.rc_channel && __rfcomm_get_sock_by_addr(sa.rc_channel, &sa.rc_bdaddr)) { err = -EADDRINUSE; } else { /* Save source address */ - bacpy(&bt_sk(sk)->src, &sa->rc_bdaddr); - rfcomm_pi(sk)->channel = sa->rc_channel; + bacpy(&bt_sk(sk)->src, &sa.rc_bdaddr); + rfcomm_pi(sk)->channel = sa.rc_channel; sk->sk_state = BT_BOUND; } |