From nobody Mon Sep 28 19:26:02 2026 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8060B3624A6 for ; Tue, 18 Aug 2026 18:35:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=209.85.128.170 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787078148; cv=pass; b=L+UQRyehrC9UdYsVJGs14HL4/Vc394ydklKrEi/8l8u3NI3LCMk8OpU4YaM07q+1N/W4dhBla9CMiEe+RbsdDFn1es64FtEHMb//nX1zp9mqOr59GG7G3AajcaQtLSf/b9OsWcGus9MiVVUjbU7A+xHEw6zXhr+TBX4QrIQPuYs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787078148; c=relaxed/simple; bh=A1yyP9A4zwfGLEXavIciHyLnRumXPrvtuxIjZzkVrC4=; h=MIME-Version:From:Date:Message-ID:Subject:To:Cc:Content-Type; b=d/ypw7jpOh6D/5qMv5naJwENz3waccS2y70212EUno+Doy6oabsmaZOxpsoWXIFW//8/7YF1q8+O1D9LZq0UQXIQqLwviNQhb4KPq4Q7o9nOEDYy/xuFxDwIbaVU3sww+q1Vvf90q5vgTvqygnFwZmkPsJyj95GF5Q5oEy+6MQk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Dduz3zd3; arc=pass smtp.client-ip=209.85.128.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Dduz3zd3" Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-836f34a0ceaso1558237b3.1 for ; Tue, 18 Aug 2026 11:35:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1787078145; cv=none; d=google.com; s=arc-20260327; b=BKDnEuV7K3pcL3m8T3yj3OulPuo5vQdb0O3+8xSJ8fj0s7UnOwSEi905IAyMMhYWKj Y3M0QNblwzdgEW6g+qTXVPORwFvQ9b2uQ48fHCMPOa8pLbfO49hxmxeOlY8B1S7uMEvD 3kT2VbpC+QgA+bC41XZvK+GMV0AdZiv3DDAOQmYjup7pItMYohnWFIi6qjx4thR26NCD HuFxKowaVUBSDu8CL35WYl+mfPG03gV6NPHHYNoBoW3YU69aQSm51LSd84B/6qMg/h5a gX1CH2SjKlK7X3GFlG39H9SD7v/7RA0OYS7Ngc8L4TLk+Zde64VdP6RS+KjzsTx7IBsv +z1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=cc:to:subject:message-id:date:from:mime-version:dkim-signature; bh=2u4tdIKzC37JyKgL3r09DYb0EDB1017msPeshMsdXcc=; fh=7qjZvFgpF2gsj3WEjeyp6P8xVVP7+kR7q5+zaWMcw5k=; b=Th0dK9bb7wyjr9l6krwkc5flU6O675Z0Mt23jSFjLQqDPKHbkrLMwQW+jgLz1drUvD pH/2LuqYw3em8MYRLQhQlJX28EiR7bcDkUAyWxiR9SdzKUYcVsyqlleTSqfriKiqlyp7 L0UERdeHu3gxV13Ybbbiepuroy/y0a1xI1/YIiaFYL2/He0i0evrZiRo2r28xMqri2K8 jk403eKuBKAFuuqFtMz88/9gPjw31/Jg3rjSY2ETHx/6Gue5LEhU6H6WRoGrS0WxDXqW zxEaDuVfwg/At9B9hUFWXCCRKlp0hwl78Xj2RdsJYObe6n3S3FUSew7iwe346bf8YBzn PQRQ==; darn=vger.kernel.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1787078145; x=1787682945; darn=vger.kernel.org; h=content-type:cc:to:subject:message-id:date:from:mime-version:from :to:cc:subject:date:message-id:reply-to:content-type; bh=2u4tdIKzC37JyKgL3r09DYb0EDB1017msPeshMsdXcc=; b=Dduz3zd3QT2LsLdW9VB0Pfw3j5T+Vus4w7s9EIw2EVmbI7oMAhCD65xrQ3DbXqROwz Rlhw1eYgbD0VEWrg5wFPUo0WrRaSb7rxfT3SKWaQ5qw0e0CS+oiq4ja6CqeUsEITmbqU 4WzBlEPlL/+KDV5M2oYWE3PJxYzWBIJkrX57kpGhbTy+NDGuuXOVXZYq68P277ajNy8c uaMKaNoIQV3GDDindpuBbTpGW78Iwnxm7V2RkSZUCdLbtqtvYiY7+5x2Oje5glE1ZXal NAZhT/4N+P+xiDuLnZcUrfciFpTSc+xEHQ9WMXxndM1gNh8mvrWxF3iEnIQXWvhwUJXO aoEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787078145; x=1787682945; h=content-type:cc:to:subject:message-id:date:from:mime-version :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to:content-type; bh=2u4tdIKzC37JyKgL3r09DYb0EDB1017msPeshMsdXcc=; b=RhetFF5F/MAIrJt9J761cNth5EudXOaQw5L9XdQQQASIdfGu9wZ/YmpI7XIgfAIZO0 PjQ2CX0Hl7GuI/QYzttx8JeIQZd782IZEDkBkiVgVtjyaHK0v/agvFw/xlkHdHijhx4k k5aZLj0pjDR6/9EnJFPxUrHBvDRsEwwu9kgn/4Fo8RXTj2SJ9NlWHhEVSuF64PawDwzX 9tEBAQIL7gnY4s7ChJNb2J039oah4ubTHwYRYPVE5RynxHMSQ/V5+X5yWQB6mbwmTuv8 QQ4CnY9/W7GX35y4AR6SIytC7itpzda1TPyNpqX5XcIwIK54TzV3E1Vv5Dko/N3nCk0l spjg== X-Forwarded-Encrypted: i=1; AHgh+RrBLerK0XXx2mqQkkSWi+F+WpN4Dyq8f3+KDp9SIxOYxe2WKFLfX8ZHLK5wW9TEEriVmsEoJ9NHbsQRrPM=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3cYzbwIXOSDzpGi1ehkz9OLjUrhd1o+jQ88T1XCgvfEjn5c27 nbF7QwJVXKFdBfaZzRujxH7jViaefNez8yNUr/jynHSLKFGtKY7go93I1rsWnmwJ/OpSUhtGcjy C8gYGdVOIOozkvQF78+f+CpBMYVTIpCC98yjOCibknSMf6obRa+r6nj00 X-Gm-Gg: AR+sD12YCT6dKSUgwogVozb3+e5VWUEDnb7WzEkkeKqLJKFKszgT04TMqO7WD6GVO1E nmlgql2M47O62/dD8CiRaOW20siJEIW8vsu1mpA1rbwm7ZBI2PGE6i+K0T0rOedtgmeFxkmaj/N L+8/m+leC4xMv5+ApCUKa7VBcFXZdFMLrWg8s5EMr6z4IwI18ctZv3BXCk2C9Ilbqmsk25RJm/E ADLSxRtpCd9accx4Je7fdmy8p1xC4K7C1CZ2twnJffrb1vOxy/rmXxSd5xvCfYwEpgkhKBKqban clotglo+ISbTCkPTQMQltJblSmj5qQVLQ+65yDxSn1TpyRmX/bWBpg35eu9kOWtAjUdRV3Odwbo G8pVd7PZSY9DJ62sH/aaVTH9V8M37 X-Received: by 2002:a05:690c:e157:20b0:820:10f1:d501 with SMTP id 00721157ae682-8419f90b6ddmr28781547b3.6.1787078144681; Tue, 18 Aug 2026 11:35:44 -0700 (PDT) Received: from 913411032810 named unknown by gmailapi.google.com with HTTPREST; Tue, 18 Aug 2026 14:35:43 -0400 Received: from 913411032810 named unknown by gmailapi.google.com with HTTPREST; Tue, 18 Aug 2026 14:31:10 -0400 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Barnes Date: Tue, 18 Aug 2026 14:35:43 -0400 X-Gm-Features: AcwNN1XPvn83tO3L9oxsCN7qhvnedbMPaOL-lf8LyIIgUJBBqsF5g-lUW7RI1nU Message-ID: Subject: [PATCH v2] platform/chrome: cros_ec_proto: Fix deferred response To: bleung@chromium.org, tzungbi@kernel.org Cc: tomhughes@chromium.org, chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When cros_ec_wait_until_complete() succeeds after an EC_RES_IN_PROGRESS status, it previously returned the 4-byte transfer size of EC_CMD_GET_COMMS_STATUS. For 0-byte payload commands (such as EC_CMD_FLASH_ERASE), userspace received 4 bytes instead of 0, causing response size validation errors. For commands expecting non-zero response payloads, the kernel exited without issuing EC_CMD_RESEND_RESPONSE, leaving response buffers uninitialized. Refactor cros_ec_wait_until_complete() to pass orig_msg, issue EC_CMD_RESEND_RESPONSE into orig_msg->data when insize > 0, and return 0 for 0-byte response commands. Signed-off-by: Rob Barnes --- v2: - Drop redundant commit description sentences (Tzung-Bi). - Align function signature parameters to open parenthesis (Tzung-Bi). - Check orig_msg->insize =3D=3D 0 and add comments explaining the logic (Tzung-Bi / Rob). - Use u32 instead of uint32_t (Tzung-Bi). - Rename 0bytes test to 0byte (Tzung-Bi). - Check header immutability for insize in test cases (Tzung-Bi). --- drivers/platform/chrome/cros_ec_proto.c | 31 ++++- drivers/platform/chrome/cros_ec_proto_test.c | 158 ++++++++++++++++++- 2 files changed, 181 insertions(+), 8 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c index a655322b599e..1fa6336c1998 100644 --- a/drivers/platform/chrome/cros_ec_proto.c +++ b/drivers/platform/chrome/cros_ec_proto.c @@ -137,7 +137,7 @@ static int cros_ec_xfer_command(struct cros_ec_device *ec_dev, struct cros_ec_co } static int cros_ec_wait_until_complete(struct cros_ec_device *ec_dev, - struct cros_ec_command *orig_msg) + struct cros_ec_command *orig_msg) { struct { struct cros_ec_command msg; @@ -171,8 +171,31 @@ static int cros_ec_wait_until_complete(struct cros_ec_device *ec_dev, break; } - if (!(status->flags & EC_COMMS_STATUS_PROCESSING)) - return ret; + if (!(status->flags & EC_COMMS_STATUS_PROCESSING)) { + u32 orig_cmd, orig_outsize, orig_version; + + /* If no response payload is expected, return 0. */ + if (orig_msg->insize =3D=3D 0) + return 0; + + /* + * Request the response using EC_CMD_RESEND_RESPONSE. + * Restore the original message fields so it appears + * to be a direct response to the original command. + */ + orig_cmd =3D orig_msg->command; + orig_outsize =3D orig_msg->outsize; + orig_version =3D orig_msg->version; + + orig_msg->command =3D EC_CMD_RESEND_RESPONSE; + orig_msg->outsize =3D 0; + orig_msg->version =3D 0; + ret =3D cros_ec_xfer_command(ec_dev, orig_msg); + orig_msg->command =3D orig_cmd; + orig_msg->outsize =3D orig_outsize; + orig_msg->version =3D orig_version; + return ret; + } } if (i >=3D EC_COMMAND_RETRIES) @@ -185,7 +213,7 @@ static int cros_ec_send_command(struct cros_ec_device *ec_dev, struct cros_ec_co int ret =3D cros_ec_xfer_command(ec_dev, msg); if (msg->result =3D=3D EC_RES_IN_PROGRESS) - ret =3D cros_ec_wait_until_complete(ec_dev, &msg->result); + ret =3D cros_ec_wait_until_complete(ec_dev, msg); return ret; } diff --git a/drivers/platform/chrome/cros_ec_proto_test.c b/drivers/platform/chrome/cros_ec_proto_test.c index 63e38671e95a..be3a61d83ade 100644 --- a/drivers/platform/chrome/cros_ec_proto_test.c +++ b/drivers/platform/chrome/cros_ec_proto_test.c @@ -1756,7 +1756,7 @@ static void cros_ec_proto_test_cmd_xfer_protocol_v2_no_op(struct kunit *test) KUNIT_EXPECT_EQ(test, ret, -EIO); } -static void cros_ec_proto_test_cmd_xfer_in_progress_normal(struct kunit *t= est) +static void cros_ec_proto_test_cmd_xfer_in_progress_payload_0byte(struct kunit *test) { struct cros_ec_proto_test_priv *priv =3D test->priv; struct cros_ec_device *ec_dev =3D &priv->ec_dev; @@ -1786,7 +1786,7 @@ static void cros_ec_proto_test_cmd_xfer_in_progress_normal(struct kunit *test) } ret =3D cros_ec_cmd_xfer(ec_dev, &msg); - KUNIT_EXPECT_EQ(test, ret, sizeof(struct ec_response_get_comms_status)); + KUNIT_EXPECT_EQ(test, ret, 0); KUNIT_EXPECT_EQ(test, msg.result, EC_RES_SUCCESS); @@ -1811,6 +1811,156 @@ static void cros_ec_proto_test_cmd_xfer_in_progress_normal(struct kunit *test) KUNIT_EXPECT_EQ(test, cros_kunit_ec_pkt_xfer_mock_called, 2); } +static void cros_ec_proto_test_cmd_xfer_in_progress_payload_4bytes(struct kunit *test) +{ + struct cros_ec_proto_test_priv *priv =3D test->priv; + struct cros_ec_device *ec_dev =3D &priv->ec_dev; + struct ec_xfer_mock *mock; + u8 resp_data[4] =3D {0x11, 0x22, 0x33, 0x44}; + struct { + struct cros_ec_command msg; + u8 data[4]; + } buf; + struct cros_ec_command *msg =3D &buf.msg; + int ret; + + memset(&buf, 0, sizeof(buf)); + msg->version =3D 1; + msg->command =3D 0x1234; + msg->outsize =3D 2; + msg->insize =3D sizeof(buf.data); + + ec_dev->pkt_xfer =3D cros_kunit_ec_pkt_xfer_mock; + + /* For initial command returning EC_RES_IN_PROGRESS. */ + { + mock =3D cros_kunit_ec_xfer_mock_addx(test, 0, EC_RES_IN_PROGRESS, 0); + KUNIT_ASSERT_PTR_NE(test, mock, NULL); + } + + /* For EC_CMD_GET_COMMS_STATUS status polling. */ + { + struct ec_response_get_comms_status *data; + + mock =3D cros_kunit_ec_xfer_mock_add(test, sizeof(*data)); + KUNIT_ASSERT_PTR_NE(test, mock, NULL); + + data =3D (struct ec_response_get_comms_status *)mock->o_data; + data->flags =3D 0; + } + + /* For EC_CMD_RESEND_RESPONSE returning 4 bytes payload. */ + { + mock =3D cros_kunit_ec_xfer_mock_add(test, sizeof(resp_data)); + KUNIT_ASSERT_PTR_NE(test, mock, NULL); + memcpy(mock->o_data, resp_data, sizeof(resp_data)); + } + + ret =3D cros_ec_cmd_xfer(ec_dev, msg); + KUNIT_EXPECT_EQ(test, ret, 4); + KUNIT_EXPECT_EQ(test, msg->result, EC_RES_SUCCESS); + KUNIT_EXPECT_EQ(test, msg->command, 0x1234); + KUNIT_EXPECT_EQ(test, msg->outsize, 2); + KUNIT_EXPECT_EQ(test, msg->insize, sizeof(buf.data)); + KUNIT_EXPECT_EQ(test, msg->version, 1); + KUNIT_EXPECT_EQ(test, memcmp(msg->data, resp_data, sizeof(resp_data)), 0); + + /* Verify mock sequence */ + { + mock =3D cros_kunit_ec_xfer_mock_next(); + KUNIT_EXPECT_PTR_NE(test, mock, NULL); + + mock =3D cros_kunit_ec_xfer_mock_next(); + KUNIT_EXPECT_PTR_NE(test, mock, NULL); + KUNIT_EXPECT_EQ(test, mock->msg.command, EC_CMD_GET_COMMS_STATUS); + + mock =3D cros_kunit_ec_xfer_mock_next(); + KUNIT_EXPECT_PTR_NE(test, mock, NULL); + KUNIT_EXPECT_EQ(test, mock->msg.command, EC_CMD_RESEND_RESPONSE); + KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0); + KUNIT_EXPECT_EQ(test, mock->msg.version, 0); + KUNIT_EXPECT_EQ(test, mock->msg.insize, 4); + } + + KUNIT_EXPECT_EQ(test, cros_kunit_ec_pkt_xfer_mock_called, 3); +} + +static void cros_ec_proto_test_cmd_xfer_in_progress_payload_gt4bytes(struct kunit *test) +{ + struct cros_ec_proto_test_priv *priv =3D test->priv; + struct cros_ec_device *ec_dev =3D &priv->ec_dev; + struct ec_xfer_mock *mock; + u8 resp_data[16]; + struct { + struct cros_ec_command msg; + u8 data[16]; + } buf; + struct cros_ec_command *msg =3D &buf.msg; + int ret, i; + + for (i =3D 0; i < sizeof(resp_data); ++i) + resp_data[i] =3D (u8)(i + 1); + + memset(&buf, 0, sizeof(buf)); + msg->version =3D 0; + msg->command =3D 0x5678; + msg->insize =3D sizeof(buf.data); + + ec_dev->pkt_xfer =3D cros_kunit_ec_pkt_xfer_mock; + + /* For initial command returning EC_RES_IN_PROGRESS. */ + { + mock =3D cros_kunit_ec_xfer_mock_addx(test, 0, EC_RES_IN_PROGRESS, 0); + KUNIT_ASSERT_PTR_NE(test, mock, NULL); + } + + /* For EC_CMD_GET_COMMS_STATUS status polling. */ + { + struct ec_response_get_comms_status *data; + + mock =3D cros_kunit_ec_xfer_mock_add(test, sizeof(*data)); + KUNIT_ASSERT_PTR_NE(test, mock, NULL); + + data =3D (struct ec_response_get_comms_status *)mock->o_data; + data->flags =3D 0; + } + + /* For EC_CMD_RESEND_RESPONSE returning 16 bytes payload. */ + { + mock =3D cros_kunit_ec_xfer_mock_add(test, sizeof(resp_data)); + KUNIT_ASSERT_PTR_NE(test, mock, NULL); + memcpy(mock->o_data, resp_data, sizeof(resp_data)); + } + + ret =3D cros_ec_cmd_xfer(ec_dev, msg); + KUNIT_EXPECT_EQ(test, ret, 16); + KUNIT_EXPECT_EQ(test, msg->result, EC_RES_SUCCESS); + KUNIT_EXPECT_EQ(test, msg->command, 0x5678); + KUNIT_EXPECT_EQ(test, msg->outsize, 0); + KUNIT_EXPECT_EQ(test, msg->insize, sizeof(buf.data)); + KUNIT_EXPECT_EQ(test, msg->version, 0); + KUNIT_EXPECT_EQ(test, memcmp(msg->data, resp_data, sizeof(resp_data)), 0); + + /* Verify mock sequence */ + { + mock =3D cros_kunit_ec_xfer_mock_next(); + KUNIT_EXPECT_PTR_NE(test, mock, NULL); + + mock =3D cros_kunit_ec_xfer_mock_next(); + KUNIT_EXPECT_PTR_NE(test, mock, NULL); + KUNIT_EXPECT_EQ(test, mock->msg.command, EC_CMD_GET_COMMS_STATUS); + + mock =3D cros_kunit_ec_xfer_mock_next(); + KUNIT_EXPECT_PTR_NE(test, mock, NULL); + KUNIT_EXPECT_EQ(test, mock->msg.command, EC_CMD_RESEND_RESPONSE); + KUNIT_EXPECT_EQ(test, mock->msg.outsize, 0); + KUNIT_EXPECT_EQ(test, mock->msg.version, 0); + KUNIT_EXPECT_EQ(test, mock->msg.insize, 16); + } + + KUNIT_EXPECT_EQ(test, cros_kunit_ec_pkt_xfer_mock_called, 3); +} + static void cros_ec_proto_test_cmd_xfer_in_progress_retries_eagain(struct kunit *test) { struct cros_ec_proto_test_priv *priv =3D test->priv; @@ -2858,7 +3008,7 @@ static struct kunit_case cros_ec_proto_test_cases[] = =3D { KUNIT_CASE(cros_ec_proto_test_cmd_xfer_protocol_v3_no_op), KUNIT_CASE(cros_ec_proto_test_cmd_xfer_protocol_v2_normal), KUNIT_CASE(cros_ec_proto_test_cmd_xfer_protocol_v2_no_op), - KUNIT_CASE(cros_ec_proto_test_cmd_xfer_in_progress_normal), + KUNIT_CASE(cros_ec_proto_test_cmd_xfer_in_progress_payload_0byte), KUNIT_CASE(cros_ec_proto_test_cmd_xfer_in_progress_payload_4bytes), KUNIT_CASE(cros_ec_proto_test_cmd_xfer_in_progress_payload_gt4bytes), KUNIT_CASE(cros_ec_proto_test_cmd_xfer_in_progress_retries_eagain),