[BlueZ PATCH] device: Fix the return type of device_irk_cmp()

[BlueZ PATCH] device: Fix the return type of device_irk_cmp()

[Andrey Smirnov]

The return value from device_irk_cmp() is returned directly from
device_addr_type_cmp() which implements a memcmp()-like interface, so
we need to return an int() and a zero for equality. Returning bool
will cause false positives since false is 0 and true is 1.

Fixes: f1fb4f95f49e ("core: Fix not resolving addresses")
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
 src/device.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/device.c b/src/device.c
index 434bdf721..26729512f 100644
--- a/src/device.c
+++ b/src/device.c
@@ -5422,24 +5422,24 @@ static bool addr_is_resolvable(const bdaddr_t *bdaddr, uint8_t addr_type)
 	}
 }

-static bool device_irk_cmp(const struct btd_device *device,
+static int device_irk_cmp(const struct btd_device *device,
 				const struct device_addr_type *addr)
 {
 	struct bt_crypto *crypto;
 	uint8_t hash[3];

 	if (!device->irk)
-		return false;
+		return -1;

 	crypto = bt_crypto_new();
 	if (!crypto)
-		return false;
+		return -1;

 	bt_crypto_ah(crypto, device->irk, addr->bdaddr.b + 3, hash);

 	bt_crypto_unref(crypto);

-	return !memcmp(addr, hash, 3);
+	return memcmp(addr, hash, 3);
 }

 int device_addr_type_cmp(gconstpointer a, gconstpointer b)
--
2.43.0

RE: [BlueZ] device: Fix the return type of device_irk_cmp()

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1023879

---Test result---

Test Summary:
CheckPatch                    PENDING   0.29 seconds
GitLint                       PENDING   0.27 seconds
BuildEll                      PASS      19.95 seconds
BluezMake                     PASS      2582.05 seconds
MakeCheck                     PASS      20.02 seconds
MakeDistcheck                 PASS      183.38 seconds
CheckValgrind                 PASS      236.32 seconds
CheckSmatch                   PASS      310.68 seconds
bluezmakeextell               PASS      127.82 seconds
IncrementalBuild              PENDING   0.21 seconds
ScanBuild                     PASS      910.65 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth