Skip to content

Commit f2e98ef

Browse files
duda-patryksmb49
authored andcommitted
platform/chrome: cros_ec_proto: Lock device when updating MKBP version
BugLink: https://bugs.launchpad.net/bugs/2078428 commit df615907f1bf907260af01ccb904d0e9304b5278 upstream. The cros_ec_get_host_command_version_mask() function requires that the caller must have ec_dev->lock mutex before calling it. This requirement was not met and as a result it was possible that two commands were sent to the device at the same time. The problem was observed while using UART backend which doesn't use any additional locks, unlike SPI backend which locks the controller until response is received. Fixes: f74c755 ("platform/chrome: cros_ec_proto: Update version on GET_NEXT_EVENT failure") Cc: stable@vger.kernel.org Signed-off-by: Patryk Duda <patrykd@google.com> Link: https://lore.kernel.org/r/20240730104425.607083-1-patrykd@google.com Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Koichiro Den <koichiro.den@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent e8b580e commit f2e98ef

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/platform/chrome/cros_ec_proto.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,9 +780,11 @@ int cros_ec_get_next_event(struct cros_ec_device *ec_dev,
780780
if (ret == -ENOPROTOOPT) {
781781
dev_dbg(ec_dev->dev,
782782
"GET_NEXT_EVENT returned invalid version error.\n");
783+
mutex_lock(&ec_dev->lock);
783784
ret = cros_ec_get_host_command_version_mask(ec_dev,
784785
EC_CMD_GET_NEXT_EVENT,
785786
&ver_mask);
787+
mutex_unlock(&ec_dev->lock);
786788
if (ret < 0 || ver_mask == 0)
787789
/*
788790
* Do not change the MKBP supported version if we can't

0 commit comments

Comments
 (0)