Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec74765d authored by Dan Carpenter's avatar Dan Carpenter Committed by Rafael J. Wysocki
Browse files

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 436db5ce

drivers/acpi/acpi_dbg.c

+6 −4
Original line number Diff line number Diff line
@@ -592,9 +592,10 @@ static int acpi_aml_read_user(char __user *buf, int len) 
	smp_rmb();

	p = &crc->buf[crc->tail];

	n = min(len, circ_count_to_end(crc));

	ret = copy_to_user(buf, p, n);

	if (IS_ERR_VALUE(ret))

	if (copy_to_user(buf, p, n)) {

		ret = -EFAULT;

		goto out;

	}

	/* sync tail after removing logs */

	smp_mb();

	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) 
	smp_mb();

	p = &crc->buf[crc->head];

	n = min(len, circ_space_to_end(crc));

	ret = copy_from_user(p, buf, n);

	if (IS_ERR_VALUE(ret))

	if (copy_from_user(p, buf, n)) {

		ret = -EFAULT;

		goto out;

	}

	/* sync head after inserting cmds */

	smp_wmb();

	crc->head = (crc->head + n) & (ACPI_AML_BUF_SIZE - 1);