| Message ID | 20200310151100.134881-1-alainm@chromium.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Marcel Holtmann |
| Headers | show |
| Series | [v1] bluetooth: Enforce classic key size verification. | expand |
Hi Alain, > This change introduces a new configuration to strictly enforce key size > checks. This ensures that systems are in a secured configuration by > default while allowing for a compatible posture via a Kconfig option to > support controllers who may not support the read encryption key size > command. > > Signed-off-by: Alain Michaud <alainm@chromium.org> > --- > > net/bluetooth/Kconfig | 10 ++++++++++ > net/bluetooth/hci_core.c | 10 ++++++++++ > net/bluetooth/hci_event.c | 5 +++++ > 3 files changed, 25 insertions(+) > > diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig > index 165148c7c4ce..6a155b7b6fb2 100644 > --- a/net/bluetooth/Kconfig > +++ b/net/bluetooth/Kconfig > @@ -128,4 +128,14 @@ config BT_DEBUGFS > Provide extensive information about internal Bluetooth states > in debugfs. > > +config BT_ENFORCE_CLASSIC_KEY_SIZES > + bool "Enforces security requirements for Bluetooth classic" > + depends on BT > + default y > + help > + Enforces Bluetooth classic security requirements by disallowing use of > + insecure Bluetooth chips, i.e. that doesn't support Read Encryption > + Key Size command to prevent BT classic connection with very short > + encryption key. > + I would drop the CLASSIC part here since it doesn’t really matter that we can enforce this in the host for LE. In general we require the hardware to give us all basics. So I would just do config BT_ENFORCE_ENC_KEY_SIZE I addition, I think that I want to put this behind BT_EXPERT option and actually have this default to n. Distributions or products should be conscious about enabling this. Otherwise I am fine doing this. > source "drivers/bluetooth/Kconfig" > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > index 4e6d61a95b20..142130d4b66b 100644 > --- a/net/bluetooth/hci_core.c > +++ b/net/bluetooth/hci_core.c > @@ -1540,6 +1540,16 @@ static int hci_dev_do_open(struct hci_dev *hdev) > > clear_bit(HCI_INIT, &hdev->flags); > > +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES > + /* Don't allow usage of Bluetooth if the chip doesn't support */ > + /* Read Encryption Key Size command */ > + if (!ret && !(hdev->commands[20] & 0x10)) { > + bt_dev_err(hdev, > + "Disabling BT, Read Encryption Key Size !supported"); > + ret = -EIO; > + } > +#endif > + I do not need to check if this is best place. So actually I would like to keep the controller in unconfigured state if a command is missing. It would stay in unconfigured state forever since there is no way to undo it. --- a/doc/mgmt-api.txt +++ b/doc/mgmt-api.txt @@ -2172,6 +2172,7 @@ Read Controller Configuration Information Command 0 External configuration 1 Bluetooth public address configuration + 2 Encryption Key Size enforcement It is valid to call this command on controllers that do not require any configuration. It is possible that a fully configured So if the Read Encryption Key Size command is supported, I would like to set the Supported_Options bit. And the Missing_Options bit would be set depending on this new Kconfig option. The real advantage with doing it like this is that when a controller is unconfigured, it is easy to detect and can be skipped for systems that have multiple controllers attached. One fun part of course is that you could disable BR/EDR and enable LE and this option could become allowed again. I would have to check if we can do that with existing mgmt commands and it would flip the Missing_Options bit. > if (!ret) { > hci_dev_hold(hdev); > hci_dev_set_flag(hdev, HCI_RPA_EXPIRED); > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > index a40ed31f6eb8..6605da7ec72e 100644 > --- a/net/bluetooth/hci_event.c > +++ b/net/bluetooth/hci_event.c > @@ -2902,7 +2902,12 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status, > if (rp->status) { > bt_dev_err(hdev, "failed to read key size for handle %u", > handle); > +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES > + hci_disconnect(conn, HCI_ERROR_REMOTE_USER_TERM); > + hci_conn_drop(conn); > +#else > conn->enc_key_size = HCI_LINK_KEY_SIZE; > +#endif > } else { > conn->enc_key_size = rp->key_size; > } This change is not needed at all if you can not bring up a controller that missing the command. Regards Marcel
Hi Marcel, On Wed, Mar 11, 2020 at 10:49 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Alain, > > > This change introduces a new configuration to strictly enforce key size > > checks. This ensures that systems are in a secured configuration by > > default while allowing for a compatible posture via a Kconfig option to > > support controllers who may not support the read encryption key size > > command. > > > > Signed-off-by: Alain Michaud <alainm@chromium.org> > > --- > > > > net/bluetooth/Kconfig | 10 ++++++++++ > > net/bluetooth/hci_core.c | 10 ++++++++++ > > net/bluetooth/hci_event.c | 5 +++++ > > 3 files changed, 25 insertions(+) > > > > diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig > > index 165148c7c4ce..6a155b7b6fb2 100644 > > --- a/net/bluetooth/Kconfig > > +++ b/net/bluetooth/Kconfig > > @@ -128,4 +128,14 @@ config BT_DEBUGFS > > Provide extensive information about internal Bluetooth states > > in debugfs. > > > > +config BT_ENFORCE_CLASSIC_KEY_SIZES > > + bool "Enforces security requirements for Bluetooth classic" > > + depends on BT > > + default y > > + help > > + Enforces Bluetooth classic security requirements by disallowing use of > > + insecure Bluetooth chips, i.e. that doesn't support Read Encryption > > + Key Size command to prevent BT classic connection with very short > > + encryption key. > > + > > I would drop the CLASSIC part here since it doesn’t really matter that we can enforce this in the host for LE. In general we require the hardware to give us all basics. So I would just do > > config BT_ENFORCE_ENC_KEY_SIZE > > I addition, I think that I want to put this behind BT_EXPERT option and actually have this default to n. Distributions or products should be conscious about enabling this. Otherwise I am fine doing this. ACK. > > > source "drivers/bluetooth/Kconfig" > > diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > > index 4e6d61a95b20..142130d4b66b 100644 > > --- a/net/bluetooth/hci_core.c > > +++ b/net/bluetooth/hci_core.c > > @@ -1540,6 +1540,16 @@ static int hci_dev_do_open(struct hci_dev *hdev) > > > > clear_bit(HCI_INIT, &hdev->flags); > > > > +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES > > + /* Don't allow usage of Bluetooth if the chip doesn't support */ > > + /* Read Encryption Key Size command */ > > + if (!ret && !(hdev->commands[20] & 0x10)) { > > + bt_dev_err(hdev, > > + "Disabling BT, Read Encryption Key Size !supported"); > > + ret = -EIO; > > + } > > +#endif > > + > > I do not need to check if this is best place. So actually I would like to keep the controller in unconfigured state if a command is missing. It would stay in unconfigured state forever since there is no way to undo it. I may need some more guidance on how to leave it in an unconfigured state the right way. > > --- a/doc/mgmt-api.txt > +++ b/doc/mgmt-api.txt > @@ -2172,6 +2172,7 @@ Read Controller Configuration Information Command > > 0 External configuration > 1 Bluetooth public address configuration > + 2 Encryption Key Size enforcement > > It is valid to call this command on controllers that do not > require any configuration. It is possible that a fully configured > > So if the Read Encryption Key Size command is supported, I would like to set the Supported_Options bit. And the Missing_Options bit would be set depending on this new Kconfig option. > > The real advantage with doing it like this is that when a controller is unconfigured, it is easy to detect and can be skipped for systems that have multiple controllers attached. > > One fun part of course is that you could disable BR/EDR and enable LE and this option could become allowed again. I would have to check if we can do that with existing mgmt commands and it would flip the Missing_Options bit. Ack. > > > if (!ret) { > > hci_dev_hold(hdev); > > hci_dev_set_flag(hdev, HCI_RPA_EXPIRED); > > diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > > index a40ed31f6eb8..6605da7ec72e 100644 > > --- a/net/bluetooth/hci_event.c > > +++ b/net/bluetooth/hci_event.c > > @@ -2902,7 +2902,12 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status, > > if (rp->status) { > > bt_dev_err(hdev, "failed to read key size for handle %u", > > handle); > > +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES > > + hci_disconnect(conn, HCI_ERROR_REMOTE_USER_TERM); > > + hci_conn_drop(conn); > > +#else > > conn->enc_key_size = HCI_LINK_KEY_SIZE; > > +#endif > > > } else { > > conn->enc_key_size = rp->key_size; > > } > > This change is not needed at all if you can not bring up a controller that missing the command. This change is different as it deals with the command failing for any reasons. In that case it would be wrong to assume the key size is 16. > > Regards > > Marcel >
Hi Alain, >>> This change introduces a new configuration to strictly enforce key size >>> checks. This ensures that systems are in a secured configuration by >>> default while allowing for a compatible posture via a Kconfig option to >>> support controllers who may not support the read encryption key size >>> command. >>> >>> Signed-off-by: Alain Michaud <alainm@chromium.org> >>> --- >>> >>> net/bluetooth/Kconfig | 10 ++++++++++ >>> net/bluetooth/hci_core.c | 10 ++++++++++ >>> net/bluetooth/hci_event.c | 5 +++++ >>> 3 files changed, 25 insertions(+) >>> >>> diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig >>> index 165148c7c4ce..6a155b7b6fb2 100644 >>> --- a/net/bluetooth/Kconfig >>> +++ b/net/bluetooth/Kconfig >>> @@ -128,4 +128,14 @@ config BT_DEBUGFS >>> Provide extensive information about internal Bluetooth states >>> in debugfs. >>> >>> +config BT_ENFORCE_CLASSIC_KEY_SIZES >>> + bool "Enforces security requirements for Bluetooth classic" >>> + depends on BT >>> + default y >>> + help >>> + Enforces Bluetooth classic security requirements by disallowing use of >>> + insecure Bluetooth chips, i.e. that doesn't support Read Encryption >>> + Key Size command to prevent BT classic connection with very short >>> + encryption key. >>> + >> >> I would drop the CLASSIC part here since it doesn’t really matter that we can enforce this in the host for LE. In general we require the hardware to give us all basics. So I would just do >> >> config BT_ENFORCE_ENC_KEY_SIZE >> >> I addition, I think that I want to put this behind BT_EXPERT option and actually have this default to n. Distributions or products should be conscious about enabling this. Otherwise I am fine doing this. > ACK. > >> >>> source "drivers/bluetooth/Kconfig" >>> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c >>> index 4e6d61a95b20..142130d4b66b 100644 >>> --- a/net/bluetooth/hci_core.c >>> +++ b/net/bluetooth/hci_core.c >>> @@ -1540,6 +1540,16 @@ static int hci_dev_do_open(struct hci_dev *hdev) >>> >>> clear_bit(HCI_INIT, &hdev->flags); >>> >>> +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES >>> + /* Don't allow usage of Bluetooth if the chip doesn't support */ >>> + /* Read Encryption Key Size command */ >>> + if (!ret && !(hdev->commands[20] & 0x10)) { >>> + bt_dev_err(hdev, >>> + "Disabling BT, Read Encryption Key Size !supported"); >>> + ret = -EIO; >>> + } >>> +#endif >>> + >> >> I do not need to check if this is best place. So actually I would like to keep the controller in unconfigured state if a command is missing. It would stay in unconfigured state forever since there is no way to undo it. > I may need some more guidance on how to leave it in an unconfigured > state the right way. I will look into this, but it will take me a bit since I need to my brain back into the right mind to grok the init procedure. >> --- a/doc/mgmt-api.txt >> +++ b/doc/mgmt-api.txt >> @@ -2172,6 +2172,7 @@ Read Controller Configuration Information Command >> >> 0 External configuration >> 1 Bluetooth public address configuration >> + 2 Encryption Key Size enforcement >> >> It is valid to call this command on controllers that do not >> require any configuration. It is possible that a fully configured >> >> So if the Read Encryption Key Size command is supported, I would like to set the Supported_Options bit. And the Missing_Options bit would be set depending on this new Kconfig option. >> >> The real advantage with doing it like this is that when a controller is unconfigured, it is easy to detect and can be skipped for systems that have multiple controllers attached. >> >> One fun part of course is that you could disable BR/EDR and enable LE and this option could become allowed again. I would have to check if we can do that with existing mgmt commands and it would flip the Missing_Options bit. > Ack. If this way of exposing this, then I might have to give this a spin and test it with the emulator. >>> if (!ret) { >>> hci_dev_hold(hdev); >>> hci_dev_set_flag(hdev, HCI_RPA_EXPIRED); >>> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c >>> index a40ed31f6eb8..6605da7ec72e 100644 >>> --- a/net/bluetooth/hci_event.c >>> +++ b/net/bluetooth/hci_event.c >>> @@ -2902,7 +2902,12 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status, >>> if (rp->status) { >>> bt_dev_err(hdev, "failed to read key size for handle %u", >>> handle); >>> +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES >>> + hci_disconnect(conn, HCI_ERROR_REMOTE_USER_TERM); >>> + hci_conn_drop(conn); >>> +#else >>> conn->enc_key_size = HCI_LINK_KEY_SIZE; >>> +#endif >> >>> } else { >>> conn->enc_key_size = rp->key_size; >>> } >> >> This change is not needed at all if you can not bring up a controller that missing the command. > This change is different as it deals with the command failing for any > reasons. In that case it would be wrong to assume the key size is 16. Good point actually. However just forcing disconnect is not going to work then. Wouldn’t it be enough to set the conn->enc_key_size to 0. The existing code should take care of gracefully rejecting the L2CAP connection. It should be the same as when the Read Encryption Key Size command returns a value lower than the required key size. Regards Marcel
Hi Marcel, On Wed, Mar 11, 2020 at 11:06 AM Marcel Holtmann <marcel@holtmann.org> wrote: > > Hi Alain, > > >>> This change introduces a new configuration to strictly enforce key size > >>> checks. This ensures that systems are in a secured configuration by > >>> default while allowing for a compatible posture via a Kconfig option to > >>> support controllers who may not support the read encryption key size > >>> command. > >>> > >>> Signed-off-by: Alain Michaud <alainm@chromium.org> > >>> --- > >>> > >>> net/bluetooth/Kconfig | 10 ++++++++++ > >>> net/bluetooth/hci_core.c | 10 ++++++++++ > >>> net/bluetooth/hci_event.c | 5 +++++ > >>> 3 files changed, 25 insertions(+) > >>> > >>> diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig > >>> index 165148c7c4ce..6a155b7b6fb2 100644 > >>> --- a/net/bluetooth/Kconfig > >>> +++ b/net/bluetooth/Kconfig > >>> @@ -128,4 +128,14 @@ config BT_DEBUGFS > >>> Provide extensive information about internal Bluetooth states > >>> in debugfs. > >>> > >>> +config BT_ENFORCE_CLASSIC_KEY_SIZES > >>> + bool "Enforces security requirements for Bluetooth classic" > >>> + depends on BT > >>> + default y > >>> + help > >>> + Enforces Bluetooth classic security requirements by disallowing use of > >>> + insecure Bluetooth chips, i.e. that doesn't support Read Encryption > >>> + Key Size command to prevent BT classic connection with very short > >>> + encryption key. > >>> + > >> > >> I would drop the CLASSIC part here since it doesn’t really matter that we can enforce this in the host for LE. In general we require the hardware to give us all basics. So I would just do > >> > >> config BT_ENFORCE_ENC_KEY_SIZE > >> > >> I addition, I think that I want to put this behind BT_EXPERT option and actually have this default to n. Distributions or products should be conscious about enabling this. Otherwise I am fine doing this. > > ACK. > > > >> > >>> source "drivers/bluetooth/Kconfig" > >>> diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c > >>> index 4e6d61a95b20..142130d4b66b 100644 > >>> --- a/net/bluetooth/hci_core.c > >>> +++ b/net/bluetooth/hci_core.c > >>> @@ -1540,6 +1540,16 @@ static int hci_dev_do_open(struct hci_dev *hdev) > >>> > >>> clear_bit(HCI_INIT, &hdev->flags); > >>> > >>> +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES > >>> + /* Don't allow usage of Bluetooth if the chip doesn't support */ > >>> + /* Read Encryption Key Size command */ > >>> + if (!ret && !(hdev->commands[20] & 0x10)) { > >>> + bt_dev_err(hdev, > >>> + "Disabling BT, Read Encryption Key Size !supported"); > >>> + ret = -EIO; > >>> + } > >>> +#endif > >>> + > >> > >> I do not need to check if this is best place. So actually I would like to keep the controller in unconfigured state if a command is missing. It would stay in unconfigured state forever since there is no way to undo it. > > I may need some more guidance on how to leave it in an unconfigured > > state the right way. > > I will look into this, but it will take me a bit since I need to my brain back into the right mind to grok the init procedure. Ack, I'll wait for some guidance on this before making progress. > > >> --- a/doc/mgmt-api.txt > >> +++ b/doc/mgmt-api.txt > >> @@ -2172,6 +2172,7 @@ Read Controller Configuration Information Command > >> > >> 0 External configuration > >> 1 Bluetooth public address configuration > >> + 2 Encryption Key Size enforcement > >> > >> It is valid to call this command on controllers that do not > >> require any configuration. It is possible that a fully configured > >> > >> So if the Read Encryption Key Size command is supported, I would like to set the Supported_Options bit. And the Missing_Options bit would be set depending on this new Kconfig option. > >> > >> The real advantage with doing it like this is that when a controller is unconfigured, it is easy to detect and can be skipped for systems that have multiple controllers attached. > >> > >> One fun part of course is that you could disable BR/EDR and enable LE and this option could become allowed again. I would have to check if we can do that with existing mgmt commands and it would flip the Missing_Options bit. > > Ack. > > If this way of exposing this, then I might have to give this a spin and test it with the emulator. Ack. This and the other bit error will likely force me to learn to use the emulator. > > >>> if (!ret) { > >>> hci_dev_hold(hdev); > >>> hci_dev_set_flag(hdev, HCI_RPA_EXPIRED); > >>> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c > >>> index a40ed31f6eb8..6605da7ec72e 100644 > >>> --- a/net/bluetooth/hci_event.c > >>> +++ b/net/bluetooth/hci_event.c > >>> @@ -2902,7 +2902,12 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status, > >>> if (rp->status) { > >>> bt_dev_err(hdev, "failed to read key size for handle %u", > >>> handle); > >>> +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES > >>> + hci_disconnect(conn, HCI_ERROR_REMOTE_USER_TERM); > >>> + hci_conn_drop(conn); > >>> +#else > >>> conn->enc_key_size = HCI_LINK_KEY_SIZE; > >>> +#endif > >> > >>> } else { > >>> conn->enc_key_size = rp->key_size; > >>> } > >> > >> This change is not needed at all if you can not bring up a controller that missing the command. > > This change is different as it deals with the command failing for any > > reasons. In that case it would be wrong to assume the key size is 16. > > Good point actually. However just forcing disconnect is not going to work then. Wouldn’t it be enough to set the conn->enc_key_size to 0. The existing code should take care of gracefully rejecting the L2CAP connection. It should be the same as when the Read Encryption Key Size command returns a value lower than the required key size. Indeed, setting it to 0 would also work. I'll make this change. > > Regards > > Marcel >
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig index 165148c7c4ce..6a155b7b6fb2 100644 --- a/net/bluetooth/Kconfig +++ b/net/bluetooth/Kconfig @@ -128,4 +128,14 @@ config BT_DEBUGFS Provide extensive information about internal Bluetooth states in debugfs. +config BT_ENFORCE_CLASSIC_KEY_SIZES + bool "Enforces security requirements for Bluetooth classic" + depends on BT + default y + help + Enforces Bluetooth classic security requirements by disallowing use of + insecure Bluetooth chips, i.e. that doesn't support Read Encryption + Key Size command to prevent BT classic connection with very short + encryption key. + source "drivers/bluetooth/Kconfig" diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 4e6d61a95b20..142130d4b66b 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1540,6 +1540,16 @@ static int hci_dev_do_open(struct hci_dev *hdev) clear_bit(HCI_INIT, &hdev->flags); +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES + /* Don't allow usage of Bluetooth if the chip doesn't support */ + /* Read Encryption Key Size command */ + if (!ret && !(hdev->commands[20] & 0x10)) { + bt_dev_err(hdev, + "Disabling BT, Read Encryption Key Size !supported"); + ret = -EIO; + } +#endif + if (!ret) { hci_dev_hold(hdev); hci_dev_set_flag(hdev, HCI_RPA_EXPIRED); diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index a40ed31f6eb8..6605da7ec72e 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -2902,7 +2902,12 @@ static void read_enc_key_size_complete(struct hci_dev *hdev, u8 status, if (rp->status) { bt_dev_err(hdev, "failed to read key size for handle %u", handle); +#ifdef BT_ENFORCE_CLASSIC_KEY_SIZES + hci_disconnect(conn, HCI_ERROR_REMOTE_USER_TERM); + hci_conn_drop(conn); +#else conn->enc_key_size = HCI_LINK_KEY_SIZE; +#endif } else { conn->enc_key_size = rp->key_size; }
This change introduces a new configuration to strictly enforce key size checks. This ensures that systems are in a secured configuration by default while allowing for a compatible posture via a Kconfig option to support controllers who may not support the read encryption key size command. Signed-off-by: Alain Michaud <alainm@chromium.org> --- net/bluetooth/Kconfig | 10 ++++++++++ net/bluetooth/hci_core.c | 10 ++++++++++ net/bluetooth/hci_event.c | 5 +++++ 3 files changed, 25 insertions(+)