[PATCH v2 0/2] Bluetooth: mgmt: remove useless NULL checks

[PATCH v2 0/2] Bluetooth: mgmt: remove useless NULL checks

[Roman Smirnov]

Svace reports NULL check after dereference in
mgmt_set_connectable_complete() and add_ext_adv_params_complete().
The following patches remove these checks.

The second version has a more compact subjects compared to the
first version.

Found by Linux Verification Center (linuxtesting.org) with Svace.

Roman Smirnov (2):
  Bluetooth: mgmt: remove useless NULL checks in
    mgmt_set_connectable_complete()
  Bluetooth: mgmt: remove useless NULL checks in
    add_ext_adv_params_complete()

 net/bluetooth/mgmt.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

-- 
2.34.1

[PATCH v2 1/2] Bluetooth: mgmt: remove NULL check in mgmt_set_connectable_complete()

[Roman Smirnov]

Remove the cmd pointer NULL check in mgmt_set_connectable_complete()
because it occurs earlier in set_connectable(). This check is also
unnecessary because the pointer is dereferenced just before it.

Found by Linux Verification Center (linuxtesting.org) with Svace.

Signed-off-by: Roman Smirnov <r.smirnov@omp.ru>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
 net/bluetooth/mgmt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index bb72ff6eb22f..cd8c4e094c55 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1702,8 +1702,7 @@ static void mgmt_set_connectable_complete(struct hci_dev *hdev, void *data,
 	new_settings(hdev, cmd->sk);
 
 done:
-	if (cmd)
-		mgmt_pending_remove(cmd);
+	mgmt_pending_remove(cmd);
 
 	hci_dev_unlock(hdev);
 }
-- 
2.34.1

[PATCH v2 2/2] Bluetooth: mgmt: remove NULL check in add_ext_adv_params_complete()

[Roman Smirnov]

Remove the cmd pointer NULL check in add_ext_adv_params_complete()
because it occurs earlier in add_ext_adv_params(). This check is
also unnecessary because the pointer is dereferenced just before it.

Found by Linux Verification Center (linuxtesting.org) with Svace.

Signed-off-by: Roman Smirnov <r.smirnov@omp.ru>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
 net/bluetooth/mgmt.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index cd8c4e094c55..b48d2d974263 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -8826,8 +8826,7 @@ static void add_ext_adv_params_complete(struct hci_dev *hdev, void *data,
 	}
 
 unlock:
-	if (cmd)
-		mgmt_pending_free(cmd);
+	mgmt_pending_free(cmd);
 
 	hci_dev_unlock(hdev);
 }
-- 
2.34.1

Re: [PATCH v2 0/2] Bluetooth: mgmt: remove useless NULL checks

[patchwork-bot+bluetooth]

Hello:

This series was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Fri, 1 Mar 2024 13:39:14 +0000 you wrote:
> Svace reports NULL check after dereference in
> mgmt_set_connectable_complete() and add_ext_adv_params_complete().
> The following patches remove these checks.
> 
> The second version has a more compact subjects compared to the
> first version.
> 
> [...]

Here is the summary with links:
  - [v2,1/2] Bluetooth: mgmt: remove NULL check in mgmt_set_connectable_complete()
    https://git.kernel.org/bluetooth/bluetooth-next/c/9f67e5ba6f6c
  - [v2,2/2] Bluetooth: mgmt: remove NULL check in add_ext_adv_params_complete()
    https://git.kernel.org/bluetooth/bluetooth-next/c/3da5589ad808

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html