summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2024-03-03 18:22:44 -0800
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2024-03-03 18:22:45 -0800
commitf80026910808274ca19ddfed1b26c85e9309a191 (patch)
tree0ee4a23a7241341131d5c0b7235c35e2c9a9f481
parent2af52f657b6b4f218d43472fa3d3a224cd1f1f2e (diff)
parent3e11fbce6336e9ffc25ef864ee19b72bb3517e90 (diff)
downloadgs-f80026910808274ca19ddfed1b26c85e9309a191.tar.gz
Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10
SBMerger: 610748217 Change-Id: Iebacab644fc51a324796dade10256c12d308231e Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--drivers/misc/gvotable.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/misc/gvotable.c b/drivers/misc/gvotable.c
index 2f245965a81e..947393b174fc 100644
--- a/drivers/misc/gvotable.c
+++ b/drivers/misc/gvotable.c
@@ -422,7 +422,8 @@ int gvotable_election_for_each(struct gvotable_election *el,
return ret;
}
- /* TODO: LOCK list? */
+ gvotable_lock_result(el);
+
list_for_each_entry(ballot, &el->votes, list) {
if (!ballot->enabled)
continue;
@@ -433,6 +434,8 @@ int gvotable_election_for_each(struct gvotable_election *el,
break;
}
+ gvotable_unlock_result(el);
+
return ret;
}
EXPORT_SYMBOL_GPL(gvotable_election_for_each);