linux-toradex.git/net/bluetooth/af_bluetooth.c, branch v3.7

userns: Properly print bluetooth socket uids

2012-10-12T20:16:47+00:00

With user namespace support enabled building bluetooth generated the warning.
net/bluetooth/af_bluetooth.c: In function ‘bt_seq_show’:
net/bluetooth/af_bluetooth.c:598:7: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 7 has type ‘kuid_t’ [-Wformat]

Convert sock_i_uid from a kuid_t to a uid_t before printing, to avoid
this problem.

Reported-by: Fengguang Wu 
Cc: Masatake YAMATO 
Cc: Gustavo Padovan 
Signed-off-by: "Eric W. Biederman"

Bluetooth: trivial: Use preferred method for NULL check

2012-08-21T17:54:39+00:00

Use standard bluetooth way to check NULL pointer !var instead of
var == NULL.

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

Bluetooth: trivial: Shorten variable scope

2012-08-15T04:14:53+00:00

Make code more clear by moving sk and bt vars to the place where
they are actually used.

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

Bluetooth: /proc/net/ entries for bluetooth protocols

2012-08-06T18:02:58+00:00

lsof command can tell the type of socket processes are using.
Internal lsof uses inode numbers on socket fs to resolve the type of
sockets. Files under /proc/net/, such as tcp, udp, unix, etc provides
such inode information.

Unfortunately bluetooth related protocols don't provide such inode
information. This patch series introduces /proc/net files for the protocols.

This patch against af_bluetooth.c provides facility to the implementation
of protocols. This patch extends bt_sock_list and introduces two exported
function bt_procfs_init, bt_procfs_cleanup.

The type bt_sock_list is already used in some of implementation of
protocols. bt_procfs_init prepare seq_operations which converts
protocol own bt_sock_list data to protocol own proc entry when the
entry is accessed.

What I, lsof user, need is just inode number of bluetooth
socket. However, people may want more information. The bt_procfs_init
takes a function pointer for customizing the show handler of
seq_operations.

In v4 patch, __acquires and __releases attributes are added to suppress
sparse warning. Suggested by Andrei Emeltchenko.

In v5 patch, linux/proc_fs.h is included to use PDE. Build error is
reported by Fengguang Wu.

Signed-off-by: Masatake YAMATO 
Signed-off-by: Gustavo Padovan

Bluetooth: Fix checking the wrong flag when accepting a socket

2012-06-05T03:34:16+00:00

Most probably a typo, the check should have been for BT_SK_DEFER_SETUP
instead of BT_DEFER_SETUP (which right now only represents a socket
option).

Signed-off-by: Vinicius Costa Gomes 
Acked-by: Andrei Emeltchenko 
Signed-off-by: Gustavo Padovan

Bluetooth: Remove unnecessary headers include

2012-06-05T03:34:08+00:00

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

Bluetooth: Fix coding style in the subsystem

2012-06-05T03:34:08+00:00

This is some leftover from the last patches that fixed style. It is mostly
line over 80 characters fixes reported by checkpatch.pl.
checkpatch.pl is clean for these files now.

Signed-off-by: Gustavo Padovan 
Signed-off-by: Marcel Holtmann

Bluetooth: Create flags for bt_sk()

2012-05-16T19:14:17+00:00

defer_setup and suspended are now flags into bt_sk().

Signed-off-by: Gustavo Padovan 
Signed-off-by: Johan Hedberg

Bluetooth: notify userspace of security level change

2012-05-14T17:51:25+00:00

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

Bluetooth: silence lockdep warning

2012-02-15T11:09:26+00:00

Since bluetooth uses multiple protocols types, to avoid lockdep
warnings, we need to use different lockdep classes (one for each
protocol type).

This is already done in bt_sock_create but it misses a couple of cases
when new connections are created. This patch corrects that to fix the
following warning:

<4>[ 1864.732366] =======================================================
<4>[ 1864.733030] [ INFO: possible circular locking dependency detected ]
<4>[ 1864.733544] 3.0.16-mid3-00007-gc9a0f62 #3
<4>[ 1864.733883] -------------------------------------------------------
<4>[ 1864.734408] t.android.btclc/4204 is trying to acquire lock:
<4>[ 1864.734869]  (rfcomm_mutex){+.+.+.}, at: [] rfcomm_dlc_close+0x15/0x30
<4>[ 1864.735541]
<4>[ 1864.735549] but task is already holding lock:
<4>[ 1864.736045]  (sk_lock-AF_BLUETOOTH){+.+.+.}, at: [] lock_sock+0xa/0xc
<4>[ 1864.736732]
<4>[ 1864.736740] which lock already depends on the new lock.
<4>[ 1864.736750]
<4>[ 1864.737428]
<4>[ 1864.737437] the existing dependency chain (in reverse order) is:
<4>[ 1864.738016]
<4>[ 1864.738023] -> #1 (sk_lock-AF_BLUETOOTH){+.+.+.}:
<4>[ 1864.738549]        [] lock_acquire+0x104/0x140
<4>[ 1864.738977]        [] lock_sock_nested+0x58/0x68
<4>[ 1864.739411]        [] l2cap_sock_sendmsg+0x3e/0x76
<4>[ 1864.739858]        [] __sock_sendmsg+0x50/0x59
<4>[ 1864.740279]        [] sock_sendmsg+0x94/0xa8
<4>[ 1864.740687]        [] kernel_sendmsg+0x28/0x37
<4>[ 1864.741106]        [] rfcomm_send_frame+0x30/0x38
<4>[ 1864.741542]        [] rfcomm_send_ua+0x58/0x5a
<4>[ 1864.741959]        [] rfcomm_run+0x441/0xb52
<4>[ 1864.742365]        [] kthread+0x63/0x68
<4>[ 1864.742742]        [] kernel_thread_helper+0x6/0xd
<4>[ 1864.743187]
<4>[ 1864.743193] -> #0 (rfcomm_mutex){+.+.+.}:
<4>[ 1864.743667]        [] __lock_acquire+0x988/0xc00
<4>[ 1864.744100]        [] lock_acquire+0x104/0x140
<4>[ 1864.744519]        [] __mutex_lock_common+0x3b/0x33f
<4>[ 1864.744975]        [] mutex_lock_nested+0x2d/0x36
<4>[ 1864.745412]        [] rfcomm_dlc_close+0x15/0x30
<4>[ 1864.745842]        [] __rfcomm_sock_close+0x5f/0x6b
<4>[ 1864.746288]        [] rfcomm_sock_shutdown+0x2f/0x62
<4>[ 1864.746737]        [] sys_socketcall+0x1db/0x422
<4>[ 1864.747165]        [] syscall_call+0x7/0xb

Signed-off-by: Octavian Purdila 
Acked-by: Marcel Holtmann 
Signed-off-by: Johan Hedberg