android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mailbox: mailbox-test: Use more consistent format for calling copy_from_user()

Browse Source 
While we're at it, ensure copy-to location is NULL'ed in the error path.

Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
This commit is contained in:
Lee Jones 2016-03-23 14:43:41 +00:00 committed by Jassi Brar
parent a61b37ead5
commit 17f5f28ffa
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mailbox/mailbox-test.c
View File

@ -46,7 +46,6 @@ static ssize_t mbox_test_signal_write(struct file *filp,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct mbox_test_device *tdev = filp->private_data; struct mbox_test_device *tdev = filp->private_data;
int ret;
if (!tdev->tx_channel) { if (!tdev->tx_channel) {
dev_err(tdev->dev, "Channel cannot do Tx\n"); dev_err(tdev->dev, "Channel cannot do Tx\n");
@ -64,13 +63,13 @@ static ssize_t mbox_test_signal_write(struct file *filp,
if (!tdev->signal) if (!tdev->signal)
return -ENOMEM; return -ENOMEM;
ret = copy_from_user(tdev->signal, userbuf, count); if (copy_from_user(tdev->signal, userbuf, count)) {
if (ret) {
kfree(tdev->signal); kfree(tdev->signal);
tdev->signal = NULL;
return -EFAULT; return -EFAULT;
} }
return ret < 0 ? ret : count; return count;
} }
static const struct file_operations mbox_test_signal_ops = { static const struct file_operations mbox_test_signal_ops = {