* [PATCH] Bluetooth: Fix crash when using new BT_PHY option
@ 2020-02-18 18:33 Luiz Augusto von Dentz
2020-02-18 21:03 ` Marcel Holtmann
0 siblings, 1 reply; 7+ messages in thread
From: Luiz Augusto von Dentz @ 2020-02-18 18:33 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
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@intel.com>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] Bluetooth: Fix crash when using new BT_PHY option
2020-02-18 18:33 [PATCH] Bluetooth: Fix crash when using new BT_PHY option Luiz Augusto von Dentz
@ 2020-02-18 21:03 ` Marcel Holtmann
0 siblings, 0 replies; 7+ messages in thread
From: Marcel Holtmann @ 2020-02-18 21:03 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hi Luiz,
> 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@intel.com>
> ---
> net/bluetooth/l2cap_sock.c | 2 +-
> net/bluetooth/sco.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Bluetooth: Fix crash when using new BT_PHY option
@ 2020-02-20 0:48 Luiz Augusto von Dentz
2020-02-20 0:48 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 7+ messages in thread
From: Luiz Augusto von Dentz @ 2020-02-20 0:48 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
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@intel.com>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] Bluetooth: Fix crash when using new BT_PHY option
2020-02-20 0:48 Luiz Augusto von Dentz
@ 2020-02-20 0:48 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 7+ messages in thread
From: Luiz Augusto von Dentz @ 2020-02-20 0:48 UTC (permalink / raw)
To: linux-bluetooth@vger.kernel.org
Hi,
On Wed, Feb 19, 2020 at 4:48 PM Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
>
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> 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@intel.com>
> ---
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Bluetooth: Fix crash when using new BT_PHY option
@ 2020-02-20 1:03 Luiz Augusto von Dentz
2020-02-20 6:26 ` Marcel Holtmann
0 siblings, 1 reply; 7+ messages in thread
From: Luiz Augusto von Dentz @ 2020-02-20 1:03 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
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@intel.com>
---
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] Bluetooth: Fix crash when using new BT_PHY option
2020-02-20 1:03 Luiz Augusto von Dentz
@ 2020-02-20 6:26 ` Marcel Holtmann
2020-02-20 8:01 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 7+ messages in thread
From: Marcel Holtmann @ 2020-02-20 6:26 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hi Luiz,
> 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@intel.com>
> ---
> 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;
> }
is there something wrong with your mailer? I have this patch 3 times and already applied one of them to bluetooth-next. Is the one incorrect?
Regards
Marcel
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] Bluetooth: Fix crash when using new BT_PHY option
2020-02-20 6:26 ` Marcel Holtmann
@ 2020-02-20 8:01 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 7+ messages in thread
From: Luiz Augusto von Dentz @ 2020-02-20 8:01 UTC (permalink / raw)
To: Marcel Holtmann; +Cc: linux-bluetooth@vger.kernel.org
Hi Marcel,
On Wed, Feb 19, 2020 at 10:26 PM Marcel Holtmann <marcel@holtmann.org> wrote:
>
> Hi Luiz,
>
> > 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@intel.com>
> > ---
> > 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;
> > }
>
> is there something wrong with your mailer? I have this patch 3 times and already applied one of them to bluetooth-next. Is the one incorrect?
It appears my outbox had the same patch multiple times, sorry about
that the intention was to to send the RFCOMM change and these got in
the way, so please disregard this one.
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-02-20 8:01 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-18 18:33 [PATCH] Bluetooth: Fix crash when using new BT_PHY option Luiz Augusto von Dentz
2020-02-18 21:03 ` Marcel Holtmann
-- strict thread matches above, loose matches on Subject: below --
2020-02-20 0:48 Luiz Augusto von Dentz
2020-02-20 0:48 ` Luiz Augusto von Dentz
2020-02-20 1:03 Luiz Augusto von Dentz
2020-02-20 6:26 ` Marcel Holtmann
2020-02-20 8:01 ` Luiz Augusto von Dentz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox