bluetooth: hci_sock: Use type cast "(void *)" to avoid building warnings
Subsystems (4)
PATCH 1/1 bluetooth: hci_sock: Use type cast "(void *)" to avoid building warnings
The related warning (with allmodconfig under xtensa):
net/bluetooth/hci_sock.c: In function 'hci_sock_sendmsg':
net/bluetooth/hci_sock.c:955:8: warning: passing argument 2 of 'hci_test_bit' discards 'const' qualifier from pointer target type [-Wdiscarded-array-qualifiers]
&hci_sec_filter.ocf_mask[ogf])) &&
^
net/bluetooth/hci_sock.c:49:19: note: expected 'void *' but argument is of type 'const __u32 (*)[4] {aka const unsigned int (*)[4]}'
static inline int hci_test_bit(int nr, void *addr)
^--- net/bluetooth/hci_sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/hci_sock.c +1 -1
@@ -952,7 +952,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,if (((ogf >HCI_SFLT_MAX_OGF ) || !hci_test_bit (ocf &HCI_FLT_OCF_BITS , - &hci_sec_filter.ocf_mask[ogf])) && + (void *)&hci_sec_filter.ocf_mask[ogf])) && !capable (CAP_NET_RAW )) { err = -EPERM ; goto drop;
Signature · 1 line
1.9.3
Quoted 1 line · Chen Gang S
The related warning (with allmodconfig under xtensa):
[]
net/bluetooth/hci_sock.c
Quoted 1 line
net/bluetooth/hci_sock.c +0
-0
[]
net/bluetooth/hci_sock.c static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock, · line 958
Quoted 9 lines
net/bluetooth/hci_sock.c +1
-1@@ -952,7 +952,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,if (((ogf >HCI_SFLT_MAX_OGF ) || !hci_test_bit (ocf &HCI_FLT_OCF_BITS , - &hci_sec_filter.ocf_mask[ogf])) && + (void *)&hci_sec_filter.ocf_mask[ogf])) && !capable (CAP_NET_RAW )) { err = -EPERM ; goto drop;
Probably better to change the hci_test_bit to take const void *
static inline int hci_test_bit(int nr, void *addr)
{
return *((__u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31));
}Quoted 17 lines · Joe Perches
Quoted 1 line · Chen Gang S
The related warning (with allmodconfig under xtensa):
[]
net/bluetooth/hci_sock.c
Quoted 1 line
net/bluetooth/hci_sock.c +0
-0[]
net/bluetooth/hci_sock.c static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock, · line 958
Quoted 9 lines
net/bluetooth/hci_sock.c +1
-1@@ -952,7 +952,7 @@ static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,if (((ogf >HCI_SFLT_MAX_OGF ) || !hci_test_bit (ocf &HCI_FLT_OCF_BITS , - &hci_sec_filter.ocf_mask[ogf])) && + (void *)&hci_sec_filter.ocf_mask[ogf])) && !capable (CAP_NET_RAW )) { err = -EPERM ; goto drop;Probably better to change the
hci_test_bitto take const void *
Quoted 5 lines
static inline int
hci_test_bit(int nr, void *addr){ return *((__u32 *) addr + (nr >> 5)) & ((__u32) 1 << (nr & 31)); }
Yeah, thanks. It should be fixed like what you said above, I shall send patch v2 for it.
Thanks.
Signature · 3 lines
Chen Gang Open, share, and attitude like air, water, and life which God blessed