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

Merge "power: qpnp-fg: Fix possible race condition in FG debugfs"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-16 03:05:08 -08:00 • committed by Gerrit - the friendly Code Review server
commit 94721ff236
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/power/supply/qcom/qpnp-fg.c
View file

@ -549,6 +549,7 @@ struct fg_trans {
struct fg_chip *chip; struct fg_chip *chip;
struct fg_log_buffer *log; /* log buffer */ struct fg_log_buffer *log; /* log buffer */
u8 *data; /* fg data that is read */ u8 *data; /* fg data that is read */
struct mutex memif_dfs_lock; /* Prevent thread concurrency */
}; };
struct fg_dbgfs { struct fg_dbgfs {
@ -5730,6 +5731,7 @@ static int fg_memif_data_open(struct inode *inode, struct file *file)
trans->addr = dbgfs_data.addr; trans->addr = dbgfs_data.addr;
trans->chip = dbgfs_data.chip; trans->chip = dbgfs_data.chip;
trans->offset = trans->addr; trans->offset = trans->addr;
mutex_init(&trans->memif_dfs_lock);
file->private_data = trans; file->private_data = trans;
return 0; return 0;
@ -5741,6 +5743,7 @@ static int fg_memif_dfs_close(struct inode *inode, struct file *file)
if (trans && trans->log && trans->data) { if (trans && trans->log && trans->data) {
file->private_data = NULL; file->private_data = NULL;
mutex_destroy(&trans->memif_dfs_lock);
kfree(trans->log); kfree(trans->log);
kfree(trans->data); kfree(trans->data);
kfree(trans); kfree(trans);
@ -5898,10 +5901,13 @@ static ssize_t fg_memif_dfs_reg_read(struct file *file, char __user *buf,
size_t ret; size_t ret;
size_t len; size_t len;
mutex_lock(&trans->memif_dfs_lock);
/* Is the the log buffer empty */ /* Is the the log buffer empty */
if (log->rpos >= log->wpos) { if (log->rpos >= log->wpos) {
if (get_log_data(trans) <= 0) if (get_log_data(trans) <= 0) {
return 0; len = 0;
goto unlock_mutex;
}
} }
len = min(count, log->wpos - log->rpos); len = min(count, log->wpos - log->rpos);
@ -5909,7 +5915,8 @@ static ssize_t fg_memif_dfs_reg_read(struct file *file, char __user *buf,
ret = copy_to_user(buf, &log->data[log->rpos], len); ret = copy_to_user(buf, &log->data[log->rpos], len);
if (ret == len) { if (ret == len) {
pr_err("error copy sram register values to user\n"); pr_err("error copy sram register values to user\n");
return -EFAULT; len = -EFAULT;
goto unlock_mutex;
} }
/* 'ret' is the number of bytes not copied */ /* 'ret' is the number of bytes not copied */
@ -5917,6 +5924,9 @@ static ssize_t fg_memif_dfs_reg_read(struct file *file, char __user *buf,
*ppos += len; *ppos += len;
log->rpos += len; log->rpos += len;
unlock_mutex:
mutex_unlock(&trans->memif_dfs_lock);
return len; return len;
} }
@ -5937,14 +5947,20 @@ static ssize_t fg_memif_dfs_reg_write(struct file *file, const char __user *buf,
int cnt = 0; int cnt = 0;
u8 *values; u8 *values;
size_t ret = 0; size_t ret = 0;
char *kbuf;
u32 offset;
struct fg_trans *trans = file->private_data; struct fg_trans *trans = file->private_data;
u32 offset = trans->offset;
mutex_lock(&trans->memif_dfs_lock);
offset = trans->offset;
/* Make a copy of the user data */ /* Make a copy of the user data */
char *kbuf = kmalloc(count + 1, GFP_KERNEL); kbuf = kmalloc(count + 1, GFP_KERNEL);
if (!kbuf) if (!kbuf) {
return -ENOMEM; ret = -ENOMEM;
goto unlock_mutex;
}
ret = copy_from_user(kbuf, buf, count); ret = copy_from_user(kbuf, buf, count);
if (ret == count) { if (ret == count) {
@ -5995,6 +6011,8 @@ static ssize_t fg_memif_dfs_reg_write(struct file *file, const char __user *buf,
free_buf: free_buf:
kfree(kbuf); kfree(kbuf);
unlock_mutex:
mutex_unlock(&trans->memif_dfs_lock);
return ret; return ret;
} }