From: Emil Karlson <jekarlson@gmail.com>
To: Emil Renner Berthing <kernel@esmil.dk>,
Neil Armstrong <narmstrong@baylibre.com>,
Stefan Adolfsson <sadolfsson@chromium.org>,
lee.jones@linaro.org, bleung@chromium.org, olof@lixom.net,
Enric Balletbo i Serra <enric.balletbo@collabora.com>,
linux-kernel@vger.kernel.org
Cc: Emil Karlson <jekarlson@gmail.com>
Subject: [PATCH v3] mfd: cros-ec: copy the whole event in get_next_event_xfer
Date: Wed, 3 Oct 2018 21:43:18 +0300 [thread overview]
Message-ID: <20181003184318.856-1-jekarlson@gmail.com> (raw)
In-Reply-To: <13bda116-5766-1340-81e1-48ca899ff41a@baylibre.com>
Commit 57e94c8b974db2d83c60e1139c89a70806abbea0 caused cros-ec keyboard events
be truncated on many chromebooks so that Left and Right keys on Column 12 were
always 0. Use ret as memcpy len to fix this.
The old code was using ec_dev->event_size, which is the event payload/data size
excluding event_type header, for the length of the memcpy operation. Use ret
as memcpy length to avoid the off by one and copy the whole msg->data.
Fixes: 57e94c8b974d ("mfd: cros-ec: Increase maximum mkbp event size")
Acked-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Tested-by: Emil Renner Berthing <kernel@esmil.dk>
Signed-off-by: Emil Karlson <jekarlson@gmail.com>
---
Notes:
Changes in v3
- Improve commit message.
Changes in v2
- Fix the off by one in memcpy parameter rather than restoring the old behaviour
for v0 messages.
drivers/platform/chrome/cros_ec_proto.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
index 398393ab5df8..b6fd4838f60f 100644
--- a/drivers/platform/chrome/cros_ec_proto.c
+++ b/drivers/platform/chrome/cros_ec_proto.c
@@ -520,7 +520,7 @@ static int get_next_event_xfer(struct cros_ec_device *ec_dev,
ret = cros_ec_cmd_xfer(ec_dev, msg);
if (ret > 0) {
ec_dev->event_size = ret - 1;
- memcpy(&ec_dev->event_data, msg->data, ec_dev->event_size);
+ memcpy(&ec_dev->event_data, msg->data, ret);
}
return ret;
--
2.19.0
next prev parent reply other threads:[~2018-10-03 18:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-27 9:24 [PATCH] mfd: cros-ec: copy the whole event when msg->version is 0 Emil Karlson
2018-09-27 9:30 ` Emil Karlson
2018-09-28 12:15 ` Neil Armstrong
2018-09-28 17:08 ` [PATCH] mfd: cros-ec: copy the whole event in get_next_event_xfer Emil Karlson
2018-09-28 17:16 ` Emil Karlson
2018-10-03 11:01 ` Enric Balletbo i Serra
2018-10-03 13:41 ` Neil Armstrong
2018-10-03 18:43 ` Emil Karlson [this message]
2018-10-10 5:06 ` [PATCH v3] " Benson Leung
2018-10-10 3:44 ` [PATCH] " Benson Leung
2018-09-28 20:27 ` [PATCH] mfd: cros-ec: copy the whole event when msg->version is 0 Emil Renner Berthing
2018-10-09 10:13 ` Lee Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181003184318.856-1-jekarlson@gmail.com \
--to=jekarlson@gmail.com \
--cc=bleung@chromium.org \
--cc=enric.balletbo@collabora.com \
--cc=kernel@esmil.dk \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=narmstrong@baylibre.com \
--cc=olof@lixom.net \
--cc=sadolfsson@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).