[PATCH v2] Bluetooth: Add mising hci_skb_opcode for raw socket commands

[PATCH v2] Bluetooth: Add mising hci_skb_opcode for raw socket commands

[Marcel Holtmann]

When HCI commands are injected via the raw socket, the core was not
including the decoded opcode value. So ensure that it is actually set.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
 net/bluetooth/hci_sock.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 19b23013c4f6..32caa6271a92 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -1242,6 +1242,11 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg,
 			goto drop;
 		}
 
+		/* Since the opcode has already been extracted here, store
+		 * a copy of the value for later use by the drivers.
+		 */
+		hci_skb_opcode(skb) = opcode;
+
 		if (ogf == 0x3f) {
 			skb_queue_tail(&hdev->raw_q, skb);
 			queue_work(hdev->workqueue, &hdev->tx_work);
-- 
2.5.0

Re: [PATCH v2] Bluetooth: Add mising hci_skb_opcode for raw socket commands

[kbuild test robot]

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

Hi Marcel,

[auto build test ERROR on bluetooth/master]
[also build test ERROR on v4.3 next-20151105]

url:    https://github.com/0day-ci/linux/commits/Marcel-Holtmann/Bluetooth-Add-mising-hci_skb_opcode-for-raw-socket-commands/20151106-144447
base:   https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git master
config: x86_64-randconfig-x002-11051802 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   net/bluetooth/hci_sock.c: In function 'hci_sock_sendmsg':
>> net/bluetooth/hci_sock.c:1248:3: error: implicit declaration of function 'hci_skb_opcode' [-Werror=implicit-function-declaration]
      hci_skb_opcode(skb) = opcode;
      ^
>> net/bluetooth/hci_sock.c:1248:23: error: lvalue required as left operand of assignment
      hci_skb_opcode(skb) = opcode;
                          ^
   cc1: some warnings being treated as errors

vim +/hci_skb_opcode +1248 net/bluetooth/hci_sock.c

  1242				goto drop;
  1243			}
  1244	
  1245			/* Since the opcode has already been extracted here, store
  1246			 * a copy of the value for later use by the drivers.
  1247			 */
> 1248			hci_skb_opcode(skb) = opcode;
  1249	
  1250			if (ogf == 0x3f) {
  1251				skb_queue_tail(&hdev->raw_q, skb);

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 28326 bytes --]

Re: [PATCH v2] Bluetooth: Add mising hci_skb_opcode for raw socket commands

[Johan Hedberg]

Hi Marcel,

On Fri, Nov 06, 2015, Marcel Holtmann wrote:
> When HCI commands are injected via the raw socket, the core was not
> including the decoded opcode value. So ensure that it is actually set.
> 
> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
> ---
>  net/bluetooth/hci_sock.c | 5 +++++
>  1 file changed, 5 insertions(+)

Applied to bluetooth-next. Thanks.

Johan