openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: Test 'count' value before enter the loop 

Testing first we avoid enter the loop when count = 0.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Gustavo F. Padovan 2010-07-24 01:34:54 -03:00 committed by Marcel Holtmann
parent 0bbdf6cba0
commit da5f6c37ee
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/bluetooth/hci_core.c
View File

@ -1149,7 +1149,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count)
if (type < HCI_ACLDATA_PKT || type > HCI_EVENT_PKT) if (type < HCI_ACLDATA_PKT || type > HCI_EVENT_PKT)
return -EILSEQ; return -EILSEQ;
do { while (count) {
rem = hci_reassembly(hdev, type, data, count, rem = hci_reassembly(hdev, type, data, count,
type - 1, GFP_ATOMIC); type - 1, GFP_ATOMIC);
if (rem < 0) if (rem < 0)
@ -1157,7 +1157,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count)
data += (count - rem); data += (count - rem);
count = rem; count = rem;
} while (count); };
return rem; return rem;
} }
@ -1170,7 +1170,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
int type; int type;
int rem = 0; int rem = 0;
do { while (count) {
struct sk_buff *skb = hdev->reassembly[STREAM_REASSEMBLY]; struct sk_buff *skb = hdev->reassembly[STREAM_REASSEMBLY];
if (!skb) { if (!skb) {
@ -1192,7 +1192,7 @@ int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count)
data += (count - rem); data += (count - rem);
count = rem; count = rem;
} while (count); };
return rem; return rem;
} }