evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "diag: Add NULL pointer check for write buffer of fwd_info"

Browse source
This commit is contained in:
Linux Build Service Account 2018-06-21 13:37:41 -07:00 • committed by Gerrit - the friendly Code Review server
commit ea54b9e530
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/char/diag/diagfwd_peripheral.c
View file

@ -1106,8 +1106,11 @@ void *diagfwd_request_write_buf(struct diagfwd_info *fwd_info)
int index; int index;
unsigned long flags; unsigned long flags;
if (!fwd_info)
return NULL;
spin_lock_irqsave(&fwd_info->write_buf_lock, flags); spin_lock_irqsave(&fwd_info->write_buf_lock, flags);
for (index = 0 ; index < NUM_WRITE_BUFFERS; index++) { for (index = 0; (index < NUM_WRITE_BUFFERS) && fwd_info->buf_ptr[index];
index++) {
if (!atomic_read(&(fwd_info->buf_ptr[index]->in_busy))) { if (!atomic_read(&(fwd_info->buf_ptr[index]->in_busy))) {
atomic_set(&(fwd_info->buf_ptr[index]->in_busy), 1); atomic_set(&(fwd_info->buf_ptr[index]->in_busy), 1);
buf = fwd_info->buf_ptr[index]->data; buf = fwd_info->buf_ptr[index]->data;
@ -1529,7 +1532,8 @@ int diagfwd_write_buffer_done(struct diagfwd_info *fwd_info, const void *ptr)
if (!fwd_info || !ptr) if (!fwd_info || !ptr)
return found; return found;
spin_lock_irqsave(&fwd_info->write_buf_lock, flags); spin_lock_irqsave(&fwd_info->write_buf_lock, flags);
for (index = 0; index < NUM_WRITE_BUFFERS; index++) { for (index = 0; (index < NUM_WRITE_BUFFERS) && fwd_info->buf_ptr[index];
index++) {
if (fwd_info->buf_ptr[index]->data == ptr) { if (fwd_info->buf_ptr[index]->data == ptr) {
atomic_set(&fwd_info->buf_ptr[index]->in_busy, 0); atomic_set(&fwd_info->buf_ptr[index]->in_busy, 0);
found = 1; found = 1;