The patch titled
memcg: avoid "free" overflow in memcg_hierarchical_free_pages()
has been removed from the -mm tree. Its filename was
memcg-add-dirty-limits-to-mem_cgroup-avoid-free-overflow-in-memcg_hierarchical_free_pages.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcg: avoid "free" overflow in memcg_hierarchical_free_pages()
From: Greg Thelen <gthelen@xxxxxxxxxx>
memcg limit and usage values are stored in res_counter, as 64-bit numbers,
even on 32-bit machines. The "free" variable in
memcg_hierarchical_free_pages() stores the difference between two 64-bit
numbers (limit - current_usage), and thus should be stored in a 64-bit
local rather than a machine defined unsigned long.
Reported-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Thelen <gthelen@xxxxxxxxxx>
Reviewed-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Dave Young <hidave.darkstar@xxxxxxxxx>
Cc: Andrea Righi <arighi@xxxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: Minchan Kim <minchan.kim@xxxxxxxxx>
Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN mm/memcontrol.c~memcg-add-dirty-limits-to-mem_cgroup-avoid-free-overflow-in-memcg_hierarchical_free_pages mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-add-dirty-limits-to-mem_cgroup-avoid-free-overflow-in-memcg_hierarchical_free_pages
+++ a/mm/memcontrol.c
@@ -1319,7 +1319,8 @@ static s64 mem_cgroup_local_page_stat(st
static unsigned long
memcg_hierarchical_free_pages(struct mem_cgroup *mem)
{
- unsigned long free, min_free;
+ u64 free;
+ unsigned long min_free;
min_free = global_page_state(NR_FREE_PAGES);
@@ -1327,7 +1328,7 @@ memcg_hierarchical_free_pages(struct mem
free = (res_counter_read_u64(&mem->res, RES_LIMIT) -
res_counter_read_u64(&mem->res, RES_USAGE)) >>
PAGE_SHIFT;
- min_free = min(min_free, free);
+ min_free = min((u64)min_free, free);
mem = parent_mem_cgroup(mem);
}
_
Patches currently in -mm which might be from gthelen@xxxxxxxxxx are
linux-next.patch
memcg-res_counter_read_u64-fix-potential-races-on-32-bit-machines.patch
memcg-break-out-event-counters-from-other-stats.patch
memcg-use-native-word-page-statistics-counters.patch
mm-memcontrolc-suppress-uninitializer-var-warning-with-older-gccs.patch
memcg-document-cgroup-dirty-memory-interfaces.patch
memcg-add-page_cgroup-flags-for-dirty-page-tracking.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
