diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2017-01-21 05:53:40 +0100 |
---|---|---|
committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2017-01-30 22:20:24 +0100 |
commit | 0abd6bdde04f3f7e9a1b76d474f3d9e804ef1867 (patch) | |
tree | 7400ddfaf6948eaf48e1e3a8a5bd83438090a48c /drivers/rpmsg/rpmsg_char.c | |
parent | rpmsg: char: add CONFIG_NET dependency (diff) | |
download | linux-0abd6bdde04f3f7e9a1b76d474f3d9e804ef1867.tar.xz linux-0abd6bdde04f3f7e9a1b76d474f3d9e804ef1867.zip |
rpmsg: unlock on error in rpmsg_eptdev_read()
We should unlock before returning if skb_dequeue() returns a NULL.
Fixes: c0cdc19f84a4 ("rpmsg: Driver for user space endpoint interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/rpmsg/rpmsg_char.c')
-rw-r--r-- | drivers/rpmsg/rpmsg_char.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index a78b6b79cea4..0ca2ccc09ca6 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -209,11 +209,10 @@ static ssize_t rpmsg_eptdev_read(struct file *filp, char __user *buf, } skb = skb_dequeue(&eptdev->queue); + spin_unlock_irqrestore(&eptdev->queue_lock, flags); if (!skb) return -EFAULT; - spin_unlock_irqrestore(&eptdev->queue_lock, flags); - use = min_t(size_t, len, skb->len); if (copy_to_user(buf, skb->data, use)) use = -EFAULT; |