linux.git/net/bluetooth/l2cap.c, branch v2.6.37

Bluetooth: fix endianness conversion in L2CAP

2010-11-09T02:56:09+00:00

Last commit added a wrong endianness conversion. Fixing that.

Reported-by: Harvey Harrison 
Signed-off-by: Gustavo F. Padovan

Bluetooth: fix unaligned access to l2cap conf data

2010-11-09T02:56:00+00:00

In function l2cap_get_conf_opt() and l2cap_add_conf_opt() the address of
opt->val sometimes is not at the edge of 2-bytes/4-bytes, so 2-bytes/4 bytes
access will cause data misalignment exeception.  Use get_unaligned_le16/32
and put_unaligned_le16/32 function to avoid data misalignment execption.

Signed-off-by: steven miao 
Signed-off-by: Mike Frysinger 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-10-21T15:43:05+00:00

Conflicts:
	net/core/dev.c

Bluetooth: fix oops in l2cap_connect_req

2010-10-17T23:19:19+00:00

In error cases when the ACL is insecure or we fail to allocate a new
struct sock, we jump to the "response" label.  If so, "sk" will be
null and the kernel crashes.

Signed-off-by: Nathan Holstein 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Update conf_state before send config_req out

2010-10-12T15:44:53+00:00

Update conf_state with L2CAP_CONF_REQ_SENT before send config_req out in
l2cap_config_req().

Signed-off-by: Haijun Liu 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Use the proper error value from bt_skb_send_alloc()

2010-10-12T15:44:52+00:00

&err points to the proper error set by bt_skb_send_alloc() when it
fails.

Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: check for l2cap header in start fragment

2010-10-12T15:44:52+00:00

BLUETOOTH SPECIFICATION Version 4.0 [Vol 3] page 36 mentioned
"Note: Start Fragments always begin with the Basic L2CAP header
of a PDU."

Signed-off-by: Andrei Emeltchenko 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: check L2CAP length in first ACL fragment

2010-10-12T15:44:52+00:00

Current Bluetooth code assembles fragments of big L2CAP packets
in l2cap_recv_acldata and then checks allowed L2CAP size in
assemled L2CAP packet (pi->imtu < skb->len).

The patch moves allowed L2CAP size check to the early stage when
we receive the first fragment of L2CAP packet. We do not need to
reserve and keep L2CAP fragments for bad packets.

Updated version after comments from Mat Martineau 
and Gustavo Padovan .

Trace below is received when using stress tools sending big
fragmented L2CAP packets.
...
[ 1712.798492] swapper: page allocation failure. order:4, mode:0x4020
[ 1712.804809] [] (unwind_backtrace+0x0/0xdc) from []
(__alloc_pages_nodemask+0x4)
[ 1712.814666] [] (__alloc_pages_nodemask+0x47c/0x4d4) from
[] (__get_free_pages+)
[ 1712.824645] [] (__get_free_pages+0x10/0x3c) from []
(__alloc_skb+0x4c/0xfc)
[ 1712.833465] [] (__alloc_skb+0x4c/0xfc) from []
(l2cap_recv_acldata+0xf0/0x1f8 )
[ 1712.843322] [] (l2cap_recv_acldata+0xf0/0x1f8 [l2cap]) from
[] (hci_rx_task+0x)
...

Signed-off-by: Andrei Emeltchenko 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Use a stream-oriented recvmsg with SOCK_STREAM L2CAP sockets.

2010-10-12T15:44:51+00:00

L2CAP ERTM sockets can be opened with the SOCK_STREAM socket type,
which is a mandatory request for ERTM mode.

However, these sockets still have SOCK_SEQPACKET read semantics when
bt_sock_recvmsg() is used to pull data from the receive queue.  If the
application is only reading part of a frame, then the unread portion
of the frame is discarded.  If the application requests more bytes
than are in the current frame, only the current frame's data is
returned.

This patch utilizes common code derived from RFCOMM's recvmsg()
function to make L2CAP SOCK_STREAM reads behave like RFCOMM reads (and
other SOCK_STREAM sockets in general).  The application may read one
byte at a time from the input stream and not lose any data, and may
also read across L2CAP frame boundaries.

Signed-off-by: Mat Martineau 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Validate PSM values in calls to connect() and bind()

2010-10-12T15:44:51+00:00

Valid L2CAP PSMs are odd numbers, and the least significant bit of the
most significant byte must be 0.

Signed-off-by: Mat Martineau 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan