s390/diag324: Preserve -EBUSY return code
PATCH 1/1 s390/diag324: Preserve -EBUSY return code
When diag324 reports -EBUSY, the error code is
overwritten by the result of copy_to_user() and put_user(). As a result, the ioctl may incorrectly return success instead of -EBUSY.
Preserve the original diag324 return code and only return -EFAULT when copying data to userspace fails.
--- arch/s390/kernel/diag/diag324.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/s390/kernel/diag/diag324.c +1 -2
@@ -182,8 +182,7 @@ long diag324_pibbuf(unsigned long arg) goto out; rc =copy_to_user ((void __user *)address, data->pib, data->pib->len); rc |=put_user (data->sequence, &udata->sequence); -if (rc) - rc = -EFAULT ; + rc = rc ? -EFAULT : data->rc; out:mutex_unlock (&pibmutex);return rc;
Signature · 1 line
2.54.0
Quoted 4 lines · Sumanth Korikkar
When diag324 reports
-EBUSY, the error code is
overwritten by the result ofcopy_to_user()andput_user(). As a result, the ioctl may incorrectly return success instead of-EBUSY.
Quoted 8 lines
Preserve the original diag324 return code and only return
-EFAULTwhen copying data to userspace fails.Fixes 90e6f191e1ee ("s390/diag324: Retrieve power readings via diag 0x324")Signed-off-by Sumanth Korikkar <[email protected]>--- arch/s390/kernel/diag/diag324.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Quoted 4 lines · Sumanth Korikkar
When diag324 reports
-EBUSY, the error code is
overwritten by the result ofcopy_to_user()andput_user(). As a result, the ioctl may incorrectly return success instead of-EBUSY.
Quoted 8 lines
Preserve the original diag324 return code and only return
-EFAULTwhen copying data to userspace fails.Fixes 90e6f191e1ee ("s390/diag324: Retrieve power readings via diag 0x324")Signed-off-by Sumanth Korikkar <[email protected]>--- arch/s390/kernel/diag/diag324.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Applied, thank you!