Bluetooth: Fix valid Identity Address check

commit e12af489b91d47a806f4e96e4edc20df612482e7 upstream.

According to the Bluetooth core specification valid identity addresses
are either Public Device Addresses or Static Random Addresses. IRKs
received with any other type of address should be discarded since we
cannot assume to know the permanent identity of the peer device.

This patch fixes a missing check for the Identity Address when receiving
the Identity Address Information SMP PDU.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index b67749bb55bffa511fd180ef52b2e9c271fa35a1..757ae32bda47457ec8f92fd0fc327e56ed003f49 100644 (file)
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -2303,8 +2303,12 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,
         * implementations are not known of and in order to not over
         * complicate our implementation, simply pretend that we never
         * received an IRK for such a device.
+        *
+        * The Identity Address must also be a Static Random or Public
+        * Address, which hci_is_identity_address() checks for.
         */
-       if (!bacmp(&info->bdaddr, BDADDR_ANY)) {
+       if (!bacmp(&info->bdaddr, BDADDR_ANY) ||
+           !hci_is_identity_address(&info->bdaddr, info->addr_type)) {
                BT_ERR("Ignoring IRK with no identity address");
                goto distribute;
        }