| commit | ebef015a20ca2b7a7b0ec49f94539886312c2705 | [log] [tgz] |
|---|---|---|
| author | Peter Collingbourne <pcc@google.com> | Tue Oct 20 00:15:44 2020 -0700 |
| committer | Peter Collingbourne <pcc@google.com> | Tue Oct 20 13:39:19 2020 -0700 |
| tree | 033be6f6a37b8245104816c798a11cc17011bfcb | |
| parent | 30b93bcd6dbd7521814f80156691d4ea16a1063f [diff] [blame] |
Fix an out-of-bounds read in assoc_next. Found using HWASan. Also sent upstream: https://github.com/andersson/pd-mapper/pull/5 Bug: 171327997 Change-Id: I69d07d0228719abbffb38aa709de39c1d8190158
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)