From: "Aneesh Kumar K.V" <aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
To: linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org,
mgorman-l3A5Bk7waGM@public.gmane.org,
kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org,
dhillf-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
aarcange-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
mhocko-AlSwsSmVLrQ@public.gmane.org,
akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org,
hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
"Aneesh Kumar K.V"
<aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Subject: [PATCH] memcg: Use scnprintf instead of sprintf
Date: Wed, 18 Apr 2012 11:45:56 +0530 [thread overview]
Message-ID: <1334729756-10212-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <20120416161354.b967790c.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
From: "Aneesh Kumar K.V" <aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
This make sure we don't overflow.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
---
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
next prev parent reply other threads:[~2012-04-18 6:15 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-16 10:44 [PATCH -V6 00/14] memcg: Add memcg extension to control HugeTLB allocation Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 01/14] hugetlb: rename max_hstate to hugetlb_max_hstate Aneesh Kumar K.V
[not found] ` <1334573091-18602-2-git-send-email-aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2012-05-24 21:11 ` David Rientjes
2012-04-16 10:44 ` [PATCH -V6 02/14] hugetlbfs: don't use ERR_PTR with VM_FAULT* values Aneesh Kumar K.V
[not found] ` <1334573091-18602-3-git-send-email-aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2012-05-24 21:17 ` David Rientjes
2012-04-16 10:44 ` [PATCH -V6 03/14] hugetlbfs: Add an inline helper for finding hstate index Aneesh Kumar K.V
[not found] ` <1334573091-18602-4-git-send-email-aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2012-05-24 21:22 ` David Rientjes
2012-05-27 20:07 ` Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 04/14] hugetlb: Use mmu_gather instead of a temporary linked list for accumulating pages Aneesh Kumar K.V
2012-04-23 23:44 ` Andrew Morton
2012-04-16 10:44 ` [PATCH -V6 05/14] hugetlb: Avoid taking i_mmap_mutex in unmap_single_vma for hugetlb Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 06/14] hugetlb: Simplify migrate_huge_page Aneesh Kumar K.V
[not found] ` <1334573091-18602-7-git-send-email-aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2012-05-24 21:35 ` David Rientjes
2012-05-27 20:13 ` Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 07/14] memcg: Add HugeTLB extension Aneesh Kumar K.V
2012-05-02 0:20 ` Paul Gortmaker
[not found] ` <CAP=VYLqgaCabQGDVgUXnCwKCZHtz0nWxpm_a6Cgz_ciMzGe9gQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-05-03 4:37 ` Aneesh Kumar K.V
[not found] ` <1334573091-18602-8-git-send-email-aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2012-05-24 21:52 ` David Rientjes
[not found] ` <alpine.DEB.2.00.1205241436180.24113-X6Q0R45D7oAcqpCFd4KODRPsWskHk0ljAL8bYrjMMd8@public.gmane.org>
2012-05-24 22:57 ` Andrew Morton
[not found] ` <20120524155727.dc6c839e.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2012-05-24 23:20 ` David Rientjes
2012-05-27 20:28 ` Aneesh Kumar K.V
2012-05-30 14:43 ` Aneesh Kumar K.V
2012-06-08 23:06 ` Andrew Morton
[not found] ` <20120608160612.dea6d1ce.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2012-06-09 14:16 ` Aneesh Kumar K.V
2012-06-10 1:55 ` David Rientjes
2012-06-10 15:04 ` Aneesh Kumar K.V
2012-06-11 3:55 ` Kamezawa Hiroyuki
[not found] ` <4FD56C19.4060307-+CUm20s59erQFUHtdCDX3A@public.gmane.org>
2012-06-11 9:23 ` David Rientjes
2012-06-15 22:31 ` Aditya Kali
[not found] ` <CAGr1F2EzDc3Ypv6twFE8Ua-JZUEkEVQJOPKwLt0O56c2-PycvA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-06-16 20:26 ` David Rientjes
2012-06-11 9:32 ` Michal Hocko
2012-04-16 10:44 ` [PATCH -V6 08/14] hugetlb: add charge/uncharge calls for HugeTLB alloc/free Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 09/14] memcg: track resource index in cftype private Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 10/14] hugetlbfs: Add memcg control files for hugetlbfs Aneesh Kumar K.V
2012-04-16 23:13 ` Andrew Morton
[not found] ` <20120416161354.b967790c.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2012-04-18 6:15 ` Aneesh Kumar K.V [this message]
[not found] ` <1334729756-10212-1-git-send-email-aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2012-04-18 22:36 ` [PATCH] memcg: Use scnprintf instead of sprintf Andrew Morton
2012-04-18 6:16 ` [PATCH -V6 10/14] hugetlbfs: Add memcg control files for hugetlbfs Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 11/14] hugetlbfs: Add a list for tracking in-use HugeTLB pages Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 12/14] memcg: move HugeTLB resource count to parent cgroup on memcg removal Aneesh Kumar K.V
[not found] ` <1334573091-18602-13-git-send-email-aneesh.kumar-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
2012-04-23 22:45 ` Andrew Morton
2012-04-16 10:44 ` [PATCH -V6 13/14] hugetlb: migrate memcg info from oldpage to new page during migration Aneesh Kumar K.V
2012-04-16 10:44 ` [PATCH -V6 14/14] memcg: Add memory controller documentation for hugetlb management Aneesh Kumar K.V
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1334729756-10212-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
--to=aneesh.kumar-23vcf4htsmix0ybbhkvfkdbpr1lh4cv8@public.gmane.org \
--cc=aarcange-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
--cc=cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=dhillf-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org \
--cc=kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org \
--cc=mgorman-l3A5Bk7waGM@public.gmane.org \
--cc=mhocko-AlSwsSmVLrQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).