Commit e90342e6 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Linus Torvalds

mm: memcontrol: use flex_array_size() helper in memcpy()

Make use of the flex_array_size() helper to calculate the size of a
flexible array member within an enclosing structure.

This helper offers defense-in-depth against potential integer overflows,
while at the same time makes it explicitly clear that we are dealing with
a flexible array member.

Also, remove unnecessary braces.
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Link: https://lkml.kernel.org/r/ddd60dae2d9aea1ccdd2be66634815c93696125e.1596214831.git.gustavoars@kernel.orgSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 433e7d31
...@@ -4255,10 +4255,9 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg, ...@@ -4255,10 +4255,9 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg,
new->size = size; new->size = size;
/* Copy thresholds (if any) to new array */ /* Copy thresholds (if any) to new array */
if (thresholds->primary) { if (thresholds->primary)
memcpy(new->entries, thresholds->primary->entries, (size - 1) * memcpy(new->entries, thresholds->primary->entries,
sizeof(struct mem_cgroup_threshold)); flex_array_size(new, entries, size - 1));
}
/* Add new threshold */ /* Add new threshold */
new->entries[size - 1].eventfd = eventfd; new->entries[size - 1].eventfd = eventfd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment