24 Oct, 2012
1 commit
-
Channel moves are triggered by changes to the BT_CHANNEL_POLICY
sockopt when an ERTM or streaming-mode channel is connected.Moves are only started if enable_hs is true.
Signed-off-by: Mat Martineau
Acked-by: Marcel Holtmann
Signed-off-by: Gustavo Padovan
20 Oct, 2012
1 commit
15 Oct, 2012
2 commits
-
When DEFER_SETUP is set defer() will trigger an authorization
request to the userspace.l2cap_chan_no_defer() is meant to be used when one does not want to
support DEFER_SETUP (A2MP for example).Acked-by: Marcel Holtmann
Signed-off-by: Gustavo Padovan -
This is part of the move the parent socket usage to l2cap_sock.c
The change is safe when it comes to locking, bt_accept_enqueue() is still
protected by the parent socket lock inside the
l2cap_sock_new_connection_cb() code.Acked-by: Marcel Holtmann
Signed-off-by: Gustavo Padovan
12 Oct, 2012
1 commit
-
Follow the net subsystem coding style
Acked-by: Marcel Holtmann
Signed-off-by: Gustavo Padovan
11 Oct, 2012
1 commit
-
Enable setting of flush timeout via setsockopt
Signed-off-by: Andrei Emeltchenko
Acked-by: Marcel Holtmann
Signed-off-by: Gustavo Padovan
09 Oct, 2012
1 commit
-
We may currently attempt to free a channel which wasn't created due to
an error in the initialization path, this would cause a NULL ptr deref.This would cause the following oops:
[ 12.919073] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010
[ 12.919131] IP: [] l2cap_chan_put+0x34/0x50
[ 12.919135] PGD 0
[ 12.919138] Oops: 0002 [#1] PREEMPT SMP DEBUG_PAGEALLOC
[ 12.919193] Dumping ftrace buffer:
[ 12.919242] (ftrace buffer empty)
[ 12.919314] Modules linked in:
[ 12.919318] CPU 1
[ 12.919319] Pid: 6210, comm: krfcommd Tainted: G W 3.6.0-next-20121004-sasha-00005-gb010653-dirty #30
[ 12.919374] RIP: 0010:[] [] l2cap_chan_put+0x34/0x50
[ 12.919377] RSP: 0000:ffff880066933c38 EFLAGS: 00010246
[ 12.919378] RAX: ffffffff8366c780 RBX: 0000000000000000 RCX: 6666666666666667
[ 12.919379] RDX: 0000000000000fa0 RSI: ffffffff84d3f79e RDI: 0000000000000010
[ 12.919381] RBP: ffff880066933c48 R08: ffffffff859989f8 R09: 0000000000000001
[ 12.919382] R10: 0000000000000000 R11: 7fffffffffffffff R12: 0000000000000000
[ 12.919383] R13: ffff88009b00a200 R14: ffff88009b00a200 R15: 0000000000000001
[ 12.919385] FS: 0000000000000000(0000) GS:ffff880033600000(0000) knlGS:0000000000000000
[ 12.919437] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 12.919440] CR2: 0000000000000010 CR3: 0000000005026000 CR4: 00000000000406e0
[ 12.919446] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 12.919451] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
[ 12.919504] Process krfcommd (pid: 6210, threadinfo ffff880066932000, task ffff880065c4b000)
[ 12.919506] Stack:
[ 12.919510] ffff88009b00a200 ffff880032084000 ffff880066933c68 ffffffff8366c7bc
[ 12.919513] 7fffffffffffffff ffff880032084000 ffff880066933c98 ffffffff833ae0ae
[ 12.919516] ffff880066933ca8 0000000000000000 0000000000000000 ffff88009b00a200
[ 12.919517] Call Trace:
[ 12.919522] [] l2cap_sock_destruct+0x3c/0x80
[ 12.919527] [] __sk_free+0x1e/0x1f0
[ 12.919530] [] sk_free+0x17/0x20
[ 12.919585] [] l2cap_sock_alloc.constprop.5+0x9e/0xd0
[ 12.919591] [] l2cap_sock_create+0x7e/0x100
[ 12.919652] [] ? _raw_read_lock+0x6a/0x80
[ 12.919658] [] ? bt_sock_create+0x74/0x110
[ 12.919660] [] bt_sock_create+0xb8/0x110
[ 12.919664] [] __sock_create+0x282/0x3b0
[ 12.919720] [] ? __sock_create+0x100/0x3b0
[ 12.919725] [] ? rfcomm_process_sessions+0x17e0/0x17e0
[ 12.919779] [] sock_create_kern+0x1f/0x30
[ 12.919784] [] rfcomm_l2sock_create+0x44/0x70
[ 12.919787] [] ? rfcomm_process_sessions+0x17e0/0x17e0
[ 12.919790] [] rfcomm_run+0x4e/0x1f0
[ 12.919846] [] ? rfcomm_process_sessions+0x17e0/0x17e0
[ 12.919852] [] kthread+0xe3/0xf0
[ 12.919908] [] ? put_lock_stats.isra.14+0xe/0x40
[ 12.919914] [] ? flush_kthread_work+0x1f0/0x1f0
[ 12.919968] [] ret_from_fork+0x7c/0x90
[ 12.919973] [] ? flush_kthread_work+0x1f0/0x1f0
[ 12.920161] Code: 83 ec 08 f6 05 ff 58 44 02 04 74 1b 8b 4f 10 48 89 fa 48 c7 c6 d9 d7 d4 84 48 c7 c7 80 9e aa 85 31 c0 e8 80
ac 3a fe 48 8d 7b 10 83 6b 10 01 0f 94 c0 84 c0 74 05 e8 8b e0 ff ff 48 83 c4 08
[ 12.920165] RIP [] l2cap_chan_put+0x34/0x50
[ 12.920166] RSP
[ 12.920167] CR2: 0000000000000010
[ 12.920417] ---[ end trace 5a9114e8a158ab84 ]---Introduced in commit 61d6ef3e ("Bluetooth: Make better use of l2cap_chan
reference counting").Signed-off-by: Sasha Levin
Signed-off-by: Gustavo Padovan
08 Oct, 2012
1 commit
-
Move code dereferencing possible NULL pointer to the check branch.
Signed-off-by: Andrei Emeltchenko
Signed-off-by: Gustavo Padovan
15 Sep, 2012
1 commit
-
Conflicts:
net/netfilter/nfnetlink_log.c
net/netfilter/xt_LOG.cRather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.Signed-off-by: David S. Miller
08 Sep, 2012
2 commits
-
…wireless into for-davem
John W. Linville says:
====================
Please pull these fixes intended for 3.6. There are more commits
here than I would like -- I got a bit behind while I was stalking
Steven Rostedt in San Diego last week... I'll slow it down after this!There are a couple of pulls here. One is from Johannes:
"Please pull (according to the below information) to get a few fixes.
* a fix to properly disconnect in the driver when authentication or
association fails
* a fix to prevent invalid information about mesh paths being reported
to userspace
* a memory leak fix in an nl80211 error path"The other comes via Gustavo:
"A few updates for the 3.6 kernel. There are two btusb patches to add
more supported devices through the new USB_VENDOR_AND_INTEFACE_INFO()
macro and another one that add a new device id for a Sony Vaio laptop,
one fix for a user-after-free and, finally, two patches from Vinicius
to fix a issue in SMP pairing."Along with those...
Arend van Spriel provides a fix for a use-after-free bug in brcmfmac.
Daniel Drake avoids a hang by not trying to touch the libertas hardware
duing suspend if it is already powered-down.Felix Fietkau provides a batch of ath9k fixes that adress some
potential problems with power settings, as well as a fix to avoid a
potential interrupt storm.Gertjan van Wingerde provides a register-width fix for rt2x00, and
a rt2x00 fix to prevent incorrectly detecting the rfkill status.
He also provides a device ID patch.Hante Meuleman gives us three brcmfmac fixes, one that properly
initializes a command structure, one that fixes a race condition that
could lose usb requests, and one that removes some log spam.Marc Kleine-Budde offers an rt2x00 fix for a voltage setting on some
specific devices.Mohammed Shafi Shajakhan sent an ath9k fix to avoid a crash related to
using timers that aren't allocated when 2 wire bluetooth coexistence
hardware is in use.Sergei Poselenov changes rt2800usb to do some validity checking for
received packets, avoiding crashes on an ARM Soc.Stone Piao gives us an mwifiex fix for an incorrectly set skb length
value for a command buffer.All of these are localized to their specific drivers, and relatively
small. The power-related patches from Felix are bigger than I would
like, but I merged them in consideration of their isolation to ath9k
and the sensitive nature of power settings in wireless devices.
====================Signed-off-by: David S. Miller <davem@davemloft.net>
27 Aug, 2012
1 commit
-
To make it clear that it may be called from contexts that may not have
any knowledge of L2CAP, we change the connection parameter, to receive
a hci_conn.This also makes it clear that it is checking the security of the link.
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo Padovan
23 Aug, 2012
1 commit
16 Aug, 2012
1 commit
-
The L2CAP code fails to initialize the l2_bdaddr_type member of struct
sockaddr_l2 and the padding byte added for alignment. It that for leaks
two bytes kernel stack via the getsockname() syscall. Add an explicit
memset(0) before filling the structure to avoid the info leak.Signed-off-by: Mathias Krause
Cc: Marcel Holtmann
Cc: Gustavo Padovan
Cc: Johan Hedberg
Signed-off-by: David S. Miller
07 Aug, 2012
3 commits
-
If l2cap_chan_create() fails then it will return from l2cap_sock_kill
since zapped flag of sk is reset.Signed-off-by: Jaganath Kanakkassery
Signed-off-by: Gustavo Padovan -
Added /proc/net/l2cap via bt_procfs_init().
Signed-off-by: Masatake YAMATO
Signed-off-by: Gustavo Padovan -
Move the l2cap channel list chan->global_l under the refcnt
protection and free it based on the refcnt.Signed-off-by: Jaganath Kanakkassery
Signed-off-by: Syam Sidhardhan
Reviewed-by: Andrei Emeltchenko
Signed-off-by: Gustavo Padovan
05 Jun, 2012
8 commits
-
This patch renames L2CAP_LE_DEFAULT_MTU macro to L2CAP_LE_MIN_MTU
since it represents the minimum MTU value, not the default MTU
value for LE.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo Padovan -
If user tries to set an invalid MTU value, l2cap_sock_setsockopt_old
should return -EINVAL.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo Padovan -
Remove socket specific code from l2cap_core.c
Signed-off-by: Gustavo Padovan
Acked-by: Andrei Emeltchenko
Signed-off-by: Marcel Holtmann -
This move socket specific code to l2cap_sock.c.
Signed-off-by: Andrei Emeltchenko
Signed-off-by: Gustavo Padovan
Signed-off-by: Marcel Holtmann -
This remove a bit more of socket code from l2cap core, this calls set the
SOCK_ZAPPED and do some clean up depending on the socket state.Reported-by: Mat Martineau
Signed-off-by: Andrei Emeltchenko
Signed-off-by: Gustavo Padovan
Signed-off-by: Marcel Holtmann -
Use chan instead of void * makes more sense here.
Signed-off-by: Gustavo Padovan
Signed-off-by: Marcel Holtmann -
Define assigned Protocol and Service Multiplexor (PSM) identifiers
and use them instead of magic numbers.Signed-off-by: Andrei Emeltchenko
Signed-off-by: Gustavo Padovan -
Most of the include were unnecessary or already included by some other
header.
Replace module.h by export.h where possible.Signed-off-by: Gustavo Padovan
Signed-off-by: Marcel Holtmann
17 May, 2012
4 commits
-
defer_setup and suspended are now flags into bt_sk().
Signed-off-by: Gustavo Padovan
Signed-off-by: Johan Hedberg -
During a security level elevation we need to keep track of the current
security level of a connection until the new one is not confirmed.Signed-off-by: Gustavo Padovan
Acked-by: Marcel Holtmann
Signed-off-by: Johan Hedberg -
The ERTM and streaming mode transmit queue must only be accessed while
the L2CAP channel lock is held. Locking the channel before calling
l2cap_chan_send ensures that multiple threads cannot simultaneously
manipulate the queue when sending and receiving concurrently.L2CAP channel locking had previously moved to the l2cap_chan struct
instead of the associated socket, so some of the old socket locking
can also be removed in this patch.Signed-off-by: Mat Martineau
Signed-off-by: Gustavo Padovan
15 May, 2012
1 commit
-
It fixes L2CAP socket based security level elevation during a
connection. The HID profile needs this (for keyboards) and it is the only
way to achieve the security level elevation when using the management
interface to talk to the kernel (hence the management enabling patch
being the one that exposes this issue).It enables the userspace a security level change when the socket is
already connected and create a way to notify the socket the result of the
request. At the moment of the request the socket is made non writable, if
the request fails the connections closes, otherwise the socket is made
writable again, POLL_OUT is emmited.Signed-off-by: Gustavo Padovan
Acked-by: Marcel Holtmann
Signed-off-by: Johan Hedberg
Signed-off-by: John W. Linville
09 May, 2012
7 commits
-
L2CAP sockets contain a pointer to l2cap_chan that needs to be
reference counted in order to prevent a possible dangling pointer when
the channel is freed.There were a few other cases where an l2cap_chan pointer on the stack
was dereferenced after a call to l2cap_chan_del. Those pointers are
also now reference counted.Signed-off-by: Mat Martineau
Signed-off-by: Gustavo Padovan -
In order to establish a LE connection we need the address type
information. User-space already pass this information to kernel
through struct sockaddr_l2.This patch adds the dst_type parameter to l2cap_chan_connect so we
are able to pass the address type info from user-space down to
hci_conn layer.Signed-off-by: Andre Guedes
Acked-by: Johan Hedberg
Signed-off-by: Marcel Holtmann -
Split the checks for sk->sk_state and sk->sk_type for L2CAP listen
sockets. This makes the code more readable.Signed-off-by: Marcel Holtmann
Signed-off-by: Gustavo Padovan -
Use ERR_PTR maginc instead.
Signed-off-by: Gustavo Padovan
Acked-by: Marcel Holtmann
Signed-off-by: Johan Hedberg -
Some parameters in L2CAP chan are set to default similar way in
socket based channels and A2MP channels. Adds common function which
sets all defaults.Signed-off-by: Andrei Emeltchenko
Signed-off-by: Gustavo Padovan -
Remove zero initialization since channel is allocated with kzalloc
in l2cap_chan_create.Signed-off-by: Andrei Emeltchenko
Acked-by: Marcel Holtmann
Signed-off-by: Gustavo Padovan -
Following the separation if core and sock code this change avoid
manipulation of sk inside l2cap_chan_create().Signed-off-by: Gustavo Padovan
28 Mar, 2012
1 commit
-
Fix network to host endian conversion for L2CAP chan id.
Signed-off-by: Santosh Nayak
Acked-by: Andrei Emeltchenko
Signed-off-by: Gustavo F. Padovan
08 Mar, 2012
1 commit
-
Signed-off-by: Gustavo F. Padovan
02 Mar, 2012
1 commit
-
The L2CAP timeout constants are always used in form of jiffies. So just
include the conversion from msecs in the define itself. This has the
advantage of making the code where the timeout is used more readable.Signed-off-by: Marcel Holtmann
Signed-off-by: Johan Hedberg