diff options
| author | Lukáš Turek <8an@praha12.net> | 2011-01-05 02:43:59 +0100 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-01-19 14:40:42 -0200 |
| commit | 683d949a7fbf33c244670e34d35c460e0d6558cb (patch) | |
| tree | fafa2f5c18d72466e859e7ade3f6a84d84bb7224 | |
| parent | e2e0cacbd4b0c7c69c7591d37c243f2363aeaa71 (diff) | |
| download | op-kernel-dev-683d949a7fbf33c244670e34d35c460e0d6558cb.zip op-kernel-dev-683d949a7fbf33c244670e34d35c460e0d6558cb.tar.gz | |
Bluetooth: Never deallocate a session when some DLC points to it
Fix a bug introduced in commit 9cf5b0ea3a7f1432c61029f7aaf4b8b338628884:
function rfcomm_recv_ua calls rfcomm_session_put without checking that
the session is not referenced by some DLC. If the session is freed, that
DLC would refer to deallocated memory, causing an oops later, as shown
in this bug report: https://bugzilla.kernel.org/show_bug.cgi?id=15994
Signed-off-by: Lukas Turek <8an@praha12.net>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index ff8aaa7..6b83776 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -1164,7 +1164,8 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci) * initiator rfcomm_process_rx already calls * rfcomm_session_put() */ if (s->sock->sk->sk_state != BT_CLOSED) - rfcomm_session_put(s); + if (list_empty(&s->dlcs)) + rfcomm_session_put(s); break; } } |
