mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 16:15:11 +00:00
PCI: switchtec: Return -EFAULT for copy_to_user() errors
[ Upstream commitddc10938e0
] switchtec_dev_read() didn't handle copy_to_user() errors correctly: it assigned "rc = -EFAULT", but actually returned either "size", -ENXIO, or -EBADMSG instead. Update the failure cases to unlock mrpc_mutex and return -EFAULT directly. Link: https://lore.kernel.org/r/20221216162126.207863-3-helgaas@kernel.org Fixes:080b47def5
("MicroSemi Switchtec management interface driver") Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Logan Gunthorpe <logang@deltatee.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
c3c277b7fd
commit
ec4b595572
1 changed files with 4 additions and 5 deletions
|
@ -606,21 +606,20 @@ static ssize_t switchtec_dev_read(struct file *filp, char __user *data,
|
||||||
rc = copy_to_user(data, &stuser->return_code,
|
rc = copy_to_user(data, &stuser->return_code,
|
||||||
sizeof(stuser->return_code));
|
sizeof(stuser->return_code));
|
||||||
if (rc) {
|
if (rc) {
|
||||||
rc = -EFAULT;
|
mutex_unlock(&stdev->mrpc_mutex);
|
||||||
goto out;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
data += sizeof(stuser->return_code);
|
data += sizeof(stuser->return_code);
|
||||||
rc = copy_to_user(data, &stuser->data,
|
rc = copy_to_user(data, &stuser->data,
|
||||||
size - sizeof(stuser->return_code));
|
size - sizeof(stuser->return_code));
|
||||||
if (rc) {
|
if (rc) {
|
||||||
rc = -EFAULT;
|
mutex_unlock(&stdev->mrpc_mutex);
|
||||||
goto out;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
stuser_set_state(stuser, MRPC_IDLE);
|
stuser_set_state(stuser, MRPC_IDLE);
|
||||||
|
|
||||||
out:
|
|
||||||
mutex_unlock(&stdev->mrpc_mutex);
|
mutex_unlock(&stdev->mrpc_mutex);
|
||||||
|
|
||||||
if (stuser->status == SWITCHTEC_MRPC_STATUS_DONE ||
|
if (stuser->status == SWITCHTEC_MRPC_STATUS_DONE ||
|
||||||
|
|
Loading…
Reference in a new issue