diff options
| author | Yuval Peress <peress@chromium.org> | 2020-01-14 11:02:34 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-29 17:14:02 +0000 |
| commit | 2187a50f7cb738aee572e3b2cbabe1c23d76000c (patch) | |
| tree | 081c976d55f3ca21c88589963964f4dc85b866b7 /test | |
| parent | b51ba7d06812b0b9d13bc63ab914fd45ade278f2 (diff) | |
| download | chrome-ec-2187a50f7cb738aee572e3b2cbabe1c23d76000c.tar.gz | |
common: motion_sense_fifo: fix iteration bug
Fix potential bug when iterating over FIFO entries for commit.
This bug can manifest when non-timestamp/non-data entries are
inserted into the FIFO.
BUG=b:138303429,chromium:1023858
TEST=Added unit tests
BRANCH=None
Signed-off-by: Yuval Peress <peress@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2012846
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
(cherry picked from commit e8b5147f37bdb347ba25780bc4b969b37fd6b239)
Change-Id: I64855db2141f7ad6aafb3f3a84632a1dabef11f4
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2492531
Diffstat (limited to 'test')
| -rw-r--r-- | test/motion_sense_fifo.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/test/motion_sense_fifo.c b/test/motion_sense_fifo.c index f18ef1de72..b16afc3479 100644 --- a/test/motion_sense_fifo.c +++ b/test/motion_sense_fifo.c @@ -329,6 +329,35 @@ static int test_spread_double_commit_same_timestamp(void) return EC_SUCCESS; } +static int test_commit_non_data_or_timestamp_entries(void) +{ + const uint32_t now = __hw_clock_source_read(); + int read_count; + + motion_sensors[0].oversampling_ratio = 1; + motion_sensors[0].collection_rate = 20000; /* ns */ + + /* Insert non-data entry */ + data[0].flags = MOTIONSENSE_SENSOR_FLAG_ODR; + motion_sense_fifo_stage_data(data, motion_sensors, 3, now - 20500); + + /* Insert data entry */ + data[0].flags = 0; + motion_sense_fifo_stage_data(data, motion_sensors, 3, now - 20500); + + motion_sense_fifo_commit_data(); + read_count = motion_sense_fifo_read( + sizeof(data), CONFIG_ACCEL_FIFO_SIZE, data, &data_bytes_read); + TEST_EQ(read_count, 4, "%d"); + TEST_BITS_SET(data[0].flags, MOTIONSENSE_SENSOR_FLAG_TIMESTAMP); + TEST_EQ(data[0].timestamp, now - 20500, "%u"); + TEST_BITS_SET(data[1].flags, MOTIONSENSE_SENSOR_FLAG_ODR); + TEST_BITS_SET(data[2].flags, MOTIONSENSE_SENSOR_FLAG_TIMESTAMP); + TEST_EQ(data[2].timestamp, now - 20500, "%u"); + + return EC_SUCCESS; +} + void before_test(void) { motion_sense_fifo_commit_data(); @@ -356,6 +385,7 @@ void run_test(void) RUN_TEST(test_spread_data_in_window); RUN_TEST(test_spread_data_by_collection_rate); RUN_TEST(test_spread_double_commit_same_timestamp); + RUN_TEST(test_commit_non_data_or_timestamp_entries); test_print_result(); } |