From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751252Ab2DRGRC (ORCPT ); Wed, 18 Apr 2012 02:17:02 -0400 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:46052 "EHLO e28smtp06.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750856Ab2DRGRA (ORCPT ); Wed, 18 Apr 2012 02:17:00 -0400 From: "Aneesh Kumar K.V" To: linux-mm@kvack.org, mgorman@suse.de, kamezawa.hiroyu@jp.fujitsu.com, dhillf@gmail.com, aarcange@redhat.com, mhocko@suse.cz, akpm@linux-foundation.org, hannes@cmpxchg.org Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, "Aneesh Kumar K.V" Subject: [PATCH] memcg: Use scnprintf instead of sprintf Date: Wed, 18 Apr 2012 11:45:56 +0530 Message-Id: <1334729756-10212-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <20120416161354.b967790c.akpm@linux-foundation.org> References: <20120416161354.b967790c.akpm@linux-foundation.org> x-cbid: 12041806-9574-0000-0000-0000023E41CA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Aneesh Kumar K.V" This make sure we don't overflow. Signed-off-by: Aneesh Kumar K.V --- mm/memcontrol.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 519d370..0ccf934 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -5269,14 +5269,14 @@ static void mem_cgroup_destroy(struct cgroup *cont) } #ifdef CONFIG_MEM_RES_CTLR_HUGETLB -static char *mem_fmt(char *buf, unsigned long n) +static char *mem_fmt(char *buf, int size, unsigned long hsize) { - if (n >= (1UL << 30)) - sprintf(buf, "%luGB", n >> 30); - else if (n >= (1UL << 20)) - sprintf(buf, "%luMB", n >> 20); + if (hsize >= (1UL << 30)) + scnprintf(buf, size, "%luGB", hsize >> 30); + else if (hsize >= (1UL << 20)) + scnprintf(buf, size, "%luMB", hsize >> 20); else - sprintf(buf, "%luKB", n >> 10); + scnprintf(buf, size, "%luKB", hsize >> 10); return buf; } @@ -5287,7 +5287,7 @@ int __init mem_cgroup_hugetlb_file_init(int idx) struct hstate *h = &hstates[idx]; /* format the size */ - mem_fmt(buf, huge_page_size(h)); + mem_fmt(buf, 32, huge_page_size(h)); /* Add the limit file */ cft = &h->mem_cgroup_files[0]; -- 1.7.10