A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

muc_uart: dont throw out message on bad magic

Browse source 
Don't toss the entire message on a bad magic number.
If there is a bad value in front, look for a valid
magic number in the rest of the data, then throw out
the bytes before it.  This is to eliminate any
random bytes that might show up before a valid message.

Change-Id: I70c395de146d7368d0d2a6433be329b8d69b5729
Signed-off-by: Ryan Lattrel <ryanl@motorola.com>
Reviewed-on: https://gerrit.mot.com/1258434
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Kenneth Kessler <kennykessler@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Ryan Lattrel 2018-10-19 14:11:37 -05:00
commit e6fb59eb84
1 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
drivers/mmi_muc_uart/muc_uart.c
View file

@ -1036,6 +1036,7 @@ static size_t muc_uart_rx_cb(struct platform_device *pdev,
uint8_t *data,
size_t len)
{
int i;
size_t content_size;
size_t segment_size;
struct mmi_uart_hdr_t *hdr;
@ -1051,6 +1052,29 @@ static size_t muc_uart_rx_cb(struct platform_device *pdev,
return 0;
hdr = (struct mmi_uart_hdr_t *)data;
/* Verify the magic number */
if (le16_to_cpu(hdr->magic) != MSG_MAGIC) {
MUC_ERR("invalid magic %x\n",
le16_to_cpu(hdr->magic));
mmi_uart_report_rx_mag_err(mm_data->uart_data);
/* Look through the rest of the data we have,
* and try to find a magic number, then throw out
* the bytes in front of it by returning the count
* before it. This function will be re-entered
* and the magic number should now be in front.
*/
for(i = 1; i < (len - 1); i++) {
if (le16_to_cpu(*(uint16_t *)(data + i)) == MSG_MAGIC) {
MUC_LOG("Found valid data at offset %d\n", i);
return i;
}
}
return i;
}
segment_size = le16_to_cpu(hdr->payload_length)
+ sizeof(*hdr) + sizeof(calc_crc);
@ -1059,15 +1083,7 @@ static size_t muc_uart_rx_cb(struct platform_device *pdev,
UART_MAX_MSG_SIZE - MSG_META_DATA_SIZE) {
MUC_ERR("invalid len %zd\n", segment_size);
mmi_uart_report_rx_len_err(mm_data->uart_data);
return len;
}
/* Verify the magic number */
if (le16_to_cpu(hdr->magic) != MSG_MAGIC) {
MUC_ERR("invalid magic %x\n",
le16_to_cpu(hdr->magic));
mmi_uart_report_rx_mag_err(mm_data->uart_data);
return len;
return sizeof(*hdr);
}
/* Need the whole message to continue */