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

Merge "soc: qcom: glink_pkt: Remove BUG_ON in glink_pkt_write"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-21 15:48:12 -08:00 • committed by Gerrit - the friendly Code Review server
commit 9c6f2a9076
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/soc/qcom/msm_glink_pkt.c
View file

@ -664,7 +664,16 @@ ssize_t glink_pkt_read(struct file *file,
spin_unlock_irqrestore(&devp->pkt_list_lock, flags); spin_unlock_irqrestore(&devp->pkt_list_lock, flags);
ret = copy_to_user(buf, pkt->data, pkt->size); ret = copy_to_user(buf, pkt->data, pkt->size);
BUG_ON(ret != 0); if (ret) {
GLINK_PKT_ERR(
"%s copy_to_user failed ret[%d] on dev id:%d size %zu\n",
__func__, ret, devp->i, pkt->size);
spin_lock_irqsave(&devp->pkt_list_lock, flags);
list_add_tail(&pkt->list, &devp->pkt_list);
spin_unlock_irqrestore(&devp->pkt_list_lock, flags);
return -EFAULT;
}
ret = pkt->size; ret = pkt->size;
glink_rx_done(devp->handle, pkt->data, false); glink_rx_done(devp->handle, pkt->data, false);
@ -738,7 +747,13 @@ ssize_t glink_pkt_write(struct file *file,
} }
ret = copy_from_user(data, buf, count); ret = copy_from_user(data, buf, count);
BUG_ON(ret != 0); if (ret) {
GLINK_PKT_ERR(
"%s copy_from_user failed ret[%d] on dev id:%d size %zu\n",
__func__, ret, devp->i, count);
kfree(data);
return -EFAULT;
}
ret = glink_tx(devp->handle, data, data, count, GLINK_TX_REQ_INTENT); ret = glink_tx(devp->handle, data, data, count, GLINK_TX_REQ_INTENT);
if (ret) { if (ret) {