deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed race condition with rf cpu in read_frame

Browse source 
Fixed a race condition that could occur in read_frame because the
dataEntry is set to PENDING before we are finished reading from it.
This commit is contained in:
Billy Kozak 2015-07-20 10:18:02 -06:00
parent 902b21a326
commit 547f8e7aaa
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cpu/cc26xx/dev/cc26xx-rf.c
View file

@ -1334,8 +1334,6 @@ read_frame(void *buf, unsigned short buf_len)
int len = 0; int len = 0;
if(GET_FIELD_V(rx_read_entry, dataEntry, status) == DATA_ENTRY_STATUS_FINISHED) { if(GET_FIELD_V(rx_read_entry, dataEntry, status) == DATA_ENTRY_STATUS_FINISHED) {
/* Set status to 0 "Pending" in element */
GET_FIELD_V(rx_read_entry, dataEntry, status) = DATA_ENTRY_STATUS_PENDING;
if(rx_read_entry[8] > 0) { if(rx_read_entry[8] > 0) {
memcpy(buf, (char *)&rx_read_entry[9], buf_len); memcpy(buf, (char *)&rx_read_entry[9], buf_len);
@ -1352,6 +1350,9 @@ read_frame(void *buf, unsigned short buf_len)
rx_read_entry[8] = 0; rx_read_entry[8] = 0;
} }
/* Set status to 0 "Pending" in element */
GET_FIELD_V(rx_read_entry, dataEntry, status) = DATA_ENTRY_STATUS_PENDING;
/* Move read entry pointer to next entry */ /* Move read entry pointer to next entry */
rx_read_entry = GET_FIELD_V(rx_read_entry, dataEntry, pNextEntry); rx_read_entry = GET_FIELD_V(rx_read_entry, dataEntry, pNextEntry);
} }