Re: [PATCH] Bluetooth: Fix crash when using new BT_PHY option

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Wed, Feb 19, 2020 at 4:48 PM Luiz Augusto von Dentz
<luiz.dentz@xxxxxxxxx> wrote:
>
> From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
>
> This fixes the invalid check for connected socket which causes the
> following trace due to sco_pi(sk)->conn being NULL:
>
> RIP: 0010:sco_sock_getsockopt+0x2ff/0x800 net/bluetooth/sco.c:966
>
> L2CAP has also been fixed since it has the same problem.
>
> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
> ---
>  net/bluetooth/l2cap_sock.c | 2 +-
>  net/bluetooth/sco.c        | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
> index 9fb47b2b13c9..305710446e66 100644
> --- a/net/bluetooth/l2cap_sock.c
> +++ b/net/bluetooth/l2cap_sock.c
> @@ -605,7 +605,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,
>                 break;
>
>         case BT_PHY:
> -               if (sk->sk_state == BT_CONNECTED) {
> +               if (sk->sk_state != BT_CONNECTED) {
>                         err = -ENOTCONN;
>                         break;
>                 }
> diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
> index 29ab3e12fb46..c8c3d38cdc7b 100644
> --- a/net/bluetooth/sco.c
> +++ b/net/bluetooth/sco.c
> @@ -958,7 +958,7 @@ static int sco_sock_getsockopt(struct socket *sock, int level, int optname,
>                 break;
>
>         case BT_PHY:
> -               if (sk->sk_state == BT_CONNECTED) {
> +               if (sk->sk_state != BT_CONNECTED) {
>                         err = -ENOTCONN;
>                         break;
>                 }
> --
> 2.21.1

Please disregard this one, it was sent by mistake.

-- 
Luiz Augusto von Dentz




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux