diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-12-24 02:24:37 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-27 19:29:41 -0500 |
commit | ec74765d9f592715292b8b33689a6af6db4cf5c5 (patch) | |
tree | 514b5f24b696674c1d2d4d1ef540a4158fc70042 | |
parent | 436db5ce0d0e892d2f7327dd7ffd573c5fb9e6cb (diff) |
ACPI / debugger: copy_to_user doesn't return errors
The copy_to/from_user() functions don't return error codes, they return
the number of bytes remaining. We had intended to return -EFUALT here.
We actually have already checked access_ok() in an earlier function so
I don't think these functions will fail but let's fix it anyway.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/acpi_dbg.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c index 975ccecf6215..e8d1698c15bb 100644 --- a/drivers/acpi/acpi_dbg.c +++ b/drivers/acpi/acpi_dbg.c | |||
@@ -592,9 +592,10 @@ static int acpi_aml_read_user(char __user *buf, int len) | |||
592 | smp_rmb(); | 592 | smp_rmb(); |
593 | p = &crc->buf[crc->tail]; | 593 | p = &crc->buf[crc->tail]; |
594 | n = min(len, circ_count_to_end(crc)); | 594 | n = min(len, circ_count_to_end(crc)); |
595 | ret = copy_to_user(buf, p, n); | 595 | if (copy_to_user(buf, p, n)) { |
596 | if (IS_ERR_VALUE(ret)) | 596 | ret = -EFAULT; |
597 | goto out; | 597 | goto out; |
598 | } | ||
598 | /* sync tail after removing logs */ | 599 | /* sync tail after removing logs */ |
599 | smp_mb(); | 600 | smp_mb(); |
600 | crc->tail = (crc->tail + n) & (ACPI_AML_BUF_SIZE - 1); | 601 | crc->tail = (crc->tail + n) & (ACPI_AML_BUF_SIZE - 1); |
@@ -661,9 +662,10 @@ static int acpi_aml_write_user(const char __user *buf, int len) | |||
661 | smp_mb(); | 662 | smp_mb(); |
662 | p = &crc->buf[crc->head]; | 663 | p = &crc->buf[crc->head]; |
663 | n = min(len, circ_space_to_end(crc)); | 664 | n = min(len, circ_space_to_end(crc)); |
664 | ret = copy_from_user(p, buf, n); | 665 | if (copy_from_user(p, buf, n)) { |
665 | if (IS_ERR_VALUE(ret)) | 666 | ret = -EFAULT; |
666 | goto out; | 667 | goto out; |
668 | } | ||
667 | /* sync head after inserting cmds */ | 669 | /* sync head after inserting cmds */ |
668 | smp_wmb(); | 670 | smp_wmb(); |
669 | crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1); | 671 | crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1); |