[v3] Bluetooth: mgmt: Fix MGMT add advmon with RSSI command

Commit Message

Howard Chung March 16, 2023, 10:11 a.m. UTC

The MGMT command: MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI uses variable
length argument. This causes host not able to register advmon with rssi.

This patch has been locally tested by adding monitor with rssi via
btmgmt on a kernel 6.1 machine.

Reviewed-by: Archie Pusaka <[e-mail]>
Fixes: b338d91703fa ("Bluetooth: Implement support for Mesh")
Signed-off-by: Howard Chung <[e-mail]>
---

Changes in v3:
- Moved commit-notes to commit message
- Fixed a typo

Changes in v2:
- Fixed git user name
- Included commit notes for the test step.

 net/bluetooth/mgmt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

[e-mail] March 16, 2023, 10:34 a.m. UTC | #1

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=730713

---Test result---

Test Summary:
CheckPatch                    PASS      0.57 seconds
GitLint                       PASS      0.25 seconds
SubjectPrefix                 PASS      0.08 seconds
BuildKernel                   PASS      30.95 seconds
CheckAllWarning               PASS      34.51 seconds
CheckSparse                   PASS      38.78 seconds
CheckSmatch                   PASS      107.82 seconds
BuildKernel32                 PASS      30.34 seconds
TestRunnerSetup               PASS      438.31 seconds
TestRunner_l2cap-tester       PASS      16.53 seconds
TestRunner_iso-tester         PASS      16.55 seconds
TestRunner_bnep-tester        PASS      5.43 seconds
TestRunner_mgmt-tester        PASS      107.89 seconds
TestRunner_rfcomm-tester      PASS      8.51 seconds
TestRunner_sco-tester         PASS      7.92 seconds
TestRunner_ioctl-tester       PASS      9.13 seconds
TestRunner_mesh-tester        PASS      6.75 seconds
TestRunner_smp-tester         PASS      7.77 seconds
TestRunner_userchan-tester    PASS      5.58 seconds
IncrementalBuild              PASS      28.36 seconds



---
Regards,
Linux Bluetooth

Luiz Augusto von Dentz March 16, 2023, 5:34 p.m. UTC | #2

Hi Howard,

On Thu, Mar 16, 2023 at 3:11 AM Howard Chung <[e-mail]> wrote:
>
> The MGMT command: MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI uses variable
> length argument. This causes host not able to register advmon with rssi.

There is a way to prevent these regression, which would be to actually
implement tests for these commands in the likes of mgmt-tester so we
can catch regressions via CI, so I hope to see some work in this
direction.

> This patch has been locally tested by adding monitor with rssi via
> btmgmt on a kernel 6.1 machine.
>
> Reviewed-by: Archie Pusaka <[e-mail]>
> Fixes: b338d91703fa ("Bluetooth: Implement support for Mesh")
> Signed-off-by: Howard Chung <[e-mail]>
> ---
>
> Changes in v3:
> - Moved commit-notes to commit message
> - Fixed a typo
>
> Changes in v2:
> - Fixed git user name
> - Included commit notes for the test step.
>
>  net/bluetooth/mgmt.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
> index 39589f864ea7..249dc6777fb4 100644
> --- a/net/bluetooth/mgmt.c
> +++ b/net/bluetooth/mgmt.c
> @@ -9357,7 +9357,8 @@ static const struct hci_mgmt_handler mgmt_handlers[] = {
>         { add_ext_adv_data,        MGMT_ADD_EXT_ADV_DATA_SIZE,
>                                                 HCI_MGMT_VAR_LEN },
>         { add_adv_patterns_monitor_rssi,
> -                                  MGMT_ADD_ADV_PATTERNS_MONITOR_RSSI_SIZE },
> +                                  MGMT_ADD_ADV_PATTERNS_MONITOR_RSSI_SIZE,
> +                                               HCI_MGMT_VAR_LEN },
>         { set_mesh,                MGMT_SET_MESH_RECEIVER_SIZE,
>                                                 HCI_MGMT_VAR_LEN },
>         { mesh_features,           MGMT_MESH_READ_FEATURES_SIZE },
> --
> 2.40.0.rc2.332.ga46443480c-goog
>

[e-mail] March 16, 2023, 5:40 p.m. UTC | #3

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Thu, 16 Mar 2023 18:11:38 +0800 you wrote:
> The MGMT command: MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI uses variable
> length argument. This causes host not able to register advmon with rssi.
> 
> This patch has been locally tested by adding monitor with rssi via
> btmgmt on a kernel 6.1 machine.
> 
> Reviewed-by: Archie Pusaka <[e-mail]>
> Fixes: b338d91703fa ("Bluetooth: Implement support for Mesh")
> Signed-off-by: Howard Chung <[e-mail]>
> 
> [...]

Here is the summary with links:
  - [v3] Bluetooth: mgmt: Fix MGMT add advmon with RSSI command
    https://git.kernel.org/bluetooth/bluetooth-next/c/8abee3773899

You are awesome, thank you!

Patch

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 39589f864ea7..249dc6777fb4 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -9357,7 +9357,8 @@  static const struct hci_mgmt_handler mgmt_handlers[] = {
 	{ add_ext_adv_data,        MGMT_ADD_EXT_ADV_DATA_SIZE,
 						HCI_MGMT_VAR_LEN },
 	{ add_adv_patterns_monitor_rssi,
-				   MGMT_ADD_ADV_PATTERNS_MONITOR_RSSI_SIZE },
+				   MGMT_ADD_ADV_PATTERNS_MONITOR_RSSI_SIZE,
+						HCI_MGMT_VAR_LEN },
 	{ set_mesh,                MGMT_SET_MESH_RECEIVER_SIZE,
 						HCI_MGMT_VAR_LEN },
 	{ mesh_features,           MGMT_MESH_READ_FEATURES_SIZE },