2010-08-04 06:43:33

by Ville Tervo

Subject: [PATCH] Bluetooth: Check result code for l2cap info rsp

Check result code in l2cap information response. Othervise
the response code would read invalid feature mask and access
invalid memory.

Signed-off-by: Ville Tervo <[email protected]>
---
net/bluetooth/l2cap.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 0f34e12..3e3cd9d 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -3348,6 +3348,15 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm

del_timer(&conn->info_timer);

+ if (result != L2CAP_IR_SUCCESS) {
+ conn->info_state |= L2CAP_INFO_FEAT_MASK_REQ_DONE;
+ conn->info_ident = 0;
+
+ l2cap_conn_start(conn);
+
+ return 0;
+ }
+
if (type == L2CAP_IT_FEAT_MASK) {
conn->feat_mask = get_unaligned_le32(rsp->data);

--
1.7.1

2010-08-04 14:27:45

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: Check result code for l2cap info rsp

Hi Ville,

> Check result code in l2cap information response. Othervise
> the response code would read invalid feature mask and access
> invalid memory.
>
> Signed-off-by: Ville Tervo <[email protected]>
> ---
> net/bluetooth/l2cap.c | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)

patch has been applied. Thanks.

Regards

Marcel