| commit | 70472bfe84f41ab0a977fddaa056b05952577d5a | [log] [tgz] |
|---|---|---|
| author | Peter Collingbourne <pcc@google.com> | Fri Oct 23 05:00:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 23 05:00:41 2020 +0000 |
| tree | 0cbbb48fc8e77ac87b29049daeefac565a507235 | |
| parent | 879028a5361478f8ff558f4ddeca926eb9420c27 [diff] | |
| parent | bd26a64425a3ee93058ec8f26ecd92fb636943ca [diff] |
Merge "Fix an out-of-bounds read in assoc_next." am: 4a86774d36 am: 64d8ff4eef am: 36e2bce0d3 am: bd26a64425 Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1468267 Change-Id: Ie4647f73e693fb9241032cb17576d90e9a5ec1bb
diff --git a/qcom/pd-mapper/assoc.c b/qcom/pd-mapper/assoc.c index 692c882..460f0d0 100644 --- a/qcom/pd-mapper/assoc.c +++ b/qcom/pd-mapper/assoc.c
@@ -128,7 +128,7 @@ { unsigned long it = *iter; - while (!assoc->keys[it] && it < assoc->size) + while (it < assoc->size && !assoc->keys[it]) it++; if (it == assoc->size)