1 files changed, 10 insertions, 10 deletions

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index de53ba1905fe..82824213d0fb 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -2515,6 +2515,16 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)
 
         memcpy(smp->remote_pk, key, 64);
 
+        if (test_bit(SMP_FLAG_REMOTE_OOB, &smp->flags)) {
+                err = smp_f4(smp->tfm_cmac, smp->remote_pk, smp->remote_pk,
+                             smp->rr, 0, cfm.confirm_val);
+                if (err)
+                        return SMP_UNSPECIFIED;
+
+                if (memcmp(cfm.confirm_val, smp->pcnf, 16))
+                        return SMP_CONFIRM_FAILED;
+        }
+
         /* Non-initiating device sends its public key after receiving
          * the key from the initiating device.
          */
@@ -2562,16 +2572,6 @@ static int smp_cmd_public_key(struct l2cap_conn *conn, struct sk_buff *skb)
                 return sc_passkey_round(smp, SMP_CMD_PUBLIC_KEY);
         }
 
-        if (test_bit(SMP_FLAG_REMOTE_OOB, &smp->flags)) {
-                err = smp_f4(smp->tfm_cmac, smp->remote_pk, smp->remote_pk,
-                             smp->rr, 0, cfm.confirm_val);
-                if (err)
-                        return SMP_UNSPECIFIED;
-
-                if (memcmp(cfm.confirm_val, smp->pcnf, 16))
-                        return SMP_CONFIRM_FAILED;
-        }
-
         if (smp->method == REQ_OOB) {
                 if (hcon->out)
                         smp_send_cmd(conn, SMP_CMD_PAIRING_RANDOM,