Bluetooth: MGMT: Replace uses of bitmap_from_u64 with bitmap_from_arr32
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: MGMT: Replace uses of bitmap_from_u64 with bitmap_from_arr32
From: Luiz Augusto von Dentz <[email protected]>
bitmap_from_u64 expects at least 8 bytes to be declared since it doesn't take any parameter regarding the number of bits causing the following warnings:
In file included from include/linux/cpumask.h:12,
from include/linux/mm_types_task.h:14,
from include/linux/mm_types.h:5,
from include/linux/buildid.h:5,
from include/linux/module.h:14,
from net/bluetooth/mgmt.c:27:
In function 'bitmap_copy',
inlined from 'bitmap_copy_clear_tail' at include/linux/bitmap.h:270:2, inlined from 'bitmap_from_u64' at include/linux/bitmap.h:622:2, inlined from 'set_device_flags' at net/bluetooth/mgmt.c:4534:4:include/linux/bitmap.h:261:9: warning: 'memcpy' forming offset [4, 7] is out of the bounds [0, 4] of object 'flags' with type
'long unsigned int[1]' [-Warray-bounds]
261 | memcpy(dst, src, len);
| ^~~~~~~~~~~~~~~~~~~~~In file included from include/linux/kasan-checks.h:5,
from include/asm-generic/rwonce.h:26,
from ./arch/arm/include/generated/asm/rwonce.h:1, from include/linux/compiler.h:248,
from include/linux/build_bug.h:5,
from include/linux/container_of.h:5,
from include/linux/list.h:5,
from include/linux/module.h:12,
from net/bluetooth/mgmt.c:27:net/bluetooth/mgmt.c: In function 'set_device_flags':net/bluetooth/mgmt.c:4532:40: note: 'flags' declared here
4532 | DECLARE_BITMAP(flags, __HCI_CONN_NUM_FLAGS);
| ^~~~~include/linux/types.h:11:23: note: in definition of macro 'DECLARE_BITMAP'
11 | unsigned long name[BITS_TO_LONGS(bits)]
| ^~~~
In order to fix the above this replaces the uses of bitmap_from_u64 with bitmap_from_arr32 wich does takes the properly take the number of bits.
--- net/bluetooth/mgmt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/bluetooth/mgmt.c +6 -3
@@ -4519,7 +4519,8 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data, cp->addr.type);if (br_params) { -bitmap_from_u64 (br_params->flags, current_flags); +bitmap_from_arr32 (br_params->flags, ¤t_flags, + __HCI_CONN_NUM_FLAGS); status =MGMT_STATUS_SUCCESS ; }else { bt_dev_warn(hdev, "No such BR/EDR device %pMR (0x%x)",
@@ -4531,7 +4532,8 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data,if (params) {DECLARE_BITMAP (flags, __HCI_CONN_NUM_FLAGS); -bitmap_from_u64 (flags, current_flags); +bitmap_from_arr32 (flags, ¤t_flags, + __HCI_CONN_NUM_FLAGS);/* Devices using RPAs can only be programmed in the * acceptlist LL Privacy has been enable otherwise they
@@ -4546,7 +4548,8 @@ static int set_device_flags(struct sock *sk, struct hci_dev *hdev, void *data, goto unlock; } -bitmap_from_u64 (params->flags, current_flags); +bitmap_from_arr32 (params->flags, ¤t_flags, + __HCI_CONN_NUM_FLAGS); status =MGMT_STATUS_SUCCESS ;/* Update passive scan if HCI_CONN_FLAG_DEVICE_PRIVACY
Signature · 1 line
2.35.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=642045
---Test result---
Test Summary:
CheckPatch FAIL 1.73 seconds GitLint PASS 1.04 seconds SubjectPrefix PASS 0.86 seconds BuildKernel PASS 41.16 seconds BuildKernel32 PASS 35.46 seconds Incremental Build with patchesPASS 47.01 seconds TestRunner: Setup PASS 580.07 seconds TestRunner: l2cap-tester PASS 19.69 seconds TestRunner: bnep-tester PASS 7.22 seconds TestRunner: mgmt-tester PASS 121.58 seconds TestRunner: rfcomm-tester PASS 11.36 seconds TestRunner: sco-tester PASS 10.91 seconds TestRunner: smp-tester PASS 10.89 seconds TestRunner: userchan-tester PASS 7.73 seconds
Details
##############################
Test: CheckPatch - FAIL - 1.73 seconds
Run checkpatch.pl script with rule in .checkpatch.conf
Bluetooth: MGMT: Replace uses of bitmap_from_u64 with bitmap_from_arr32\WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #111:
4532 | DECLARE_BITMAP(flags, __HCI_CONN_NUM_FLAGS);
WARNING:BAD_SIGN_OFF: 'Reported-by:' is the preferred signature form #121:
total: 0 errors, 2 warnings, 0 checks, 27 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12851256.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth