2020-03-28 00:35:04

by Sonny Sasaka

Subject: [PATCH] Bluetooth: Always request for user confirmation for Just Works

From: Sonny Sasaka <[email protected]>

To improve security, always give the user-space daemon a chance to
accept or reject a Just Works pairing (LE). The daemon may decide to
auto-accept based on the user's intent.

Signed-off-by: Sonny Sasaka <[email protected]>
---
net/bluetooth/smp.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 1476a91ce935..d0b695ee49f6 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -855,6 +855,7 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
struct smp_chan *smp = chan->data;
u32 passkey = 0;
int ret = 0;
+ int err;

/* Initialize key for JUST WORKS */
memset(smp->tk, 0, sizeof(smp->tk));
@@ -883,9 +884,16 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth,
hcon->io_capability == HCI_IO_NO_INPUT_OUTPUT)
smp->method = JUST_WORKS;

- /* If Just Works, Continue with Zero TK */
+ /* If Just Works, Continue with Zero TK and ask user-space for
+ * confirmation */
if (smp->method == JUST_WORKS) {
- set_bit(SMP_FLAG_TK_VALID, &smp->flags);
+ err = mgmt_user_confirm_request(hcon->hdev, &hcon->dst,
+ hcon->type,
+ hcon->dst_type,
+ passkey, 1);
+ if (err)
+ return SMP_UNSPECIFIED;
+ set_bit(SMP_FLAG_WAIT_USER, &smp->flags);
return 0;
}

--
2.17.1

2020-03-30 22:28:19

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: Always request for user confirmation for Just Works

Hi Sonny,

> To improve security, always give the user-space daemon a chance to
> accept or reject a Just Works pairing (LE). The daemon may decide to
> auto-accept based on the user's intent.
>
> Signed-off-by: Sonny Sasaka <[email protected]>
> ---
> net/bluetooth/smp.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel

2020-03-30 23:15:25

by Sonny Sasaka

Subject: Re: [PATCH] Bluetooth: Always request for user confirmation for Just Works

Thanks, Marcel.

On Mon, Mar 30, 2020 at 3:24 PM Marcel Holtmann <[email protected]> wrote:
>
> Hi Sonny,
>
> > To improve security, always give the user-space daemon a chance to
> > accept or reject a Just Works pairing (LE). The daemon may decide to
> > auto-accept based on the user's intent.
> >
> > Signed-off-by: Sonny Sasaka <[email protected]>
> > ---
> > net/bluetooth/smp.c | 12 ++++++++++--
> > 1 file changed, 10 insertions(+), 2 deletions(-)
>
> patch has been applied to bluetooth-next tree.
>
> Regards
>
> Marcel
>