| Message ID | 20220615073348.6891-1-jianchunfu@cmss.chinamobile.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b5f37a0b6f667f5c72340ca9dcd7703f261cb981 |
| Headers | show |
| Series | [v2] rtla/utils: Use calloc and check the potential memory allocation failure | expand |
On 6/15/22 09:33, jianchunfu wrote: > Replace malloc with calloc and add memory allocating check > of mon_cpus before used. > > Fixes: 7d0dc9576dc3 ("rtla/timerlat: Add --dma-latency option") > Signed-off-by: jianchunfu <jianchunfu@cmss.chinamobile.com> Acked-by: Daniel Bristot de Oliveira <bristot@kernel.org> Thanks! -- Daniel
On Fri, 8 Jul 2022 14:37:22 +0200 Daniel Bristot de Oliveira <bristot@kernel.org> wrote: > On 6/15/22 09:33, jianchunfu wrote: > > Replace malloc with calloc and add memory allocating check > > of mon_cpus before used. > > > > Fixes: 7d0dc9576dc3 ("rtla/timerlat: Add --dma-latency option") > > Signed-off-by: jianchunfu <jianchunfu@cmss.chinamobile.com> > > Acked-by: Daniel Bristot de Oliveira <bristot@kernel.org> > Applied, thanks jianchunfu and Daniel! -- Steve
diff --git a/tools/tracing/rtla/src/utils.c b/tools/tracing/rtla/src/utils.c index ffaf8ec84..56bdc9962 100644 --- a/tools/tracing/rtla/src/utils.c +++ b/tools/tracing/rtla/src/utils.c @@ -105,8 +105,9 @@ int parse_cpu_list(char *cpu_list, char **monitored_cpus) nr_cpus = sysconf(_SC_NPROCESSORS_CONF); - mon_cpus = malloc(nr_cpus * sizeof(char)); - memset(mon_cpus, 0, (nr_cpus * sizeof(char))); + mon_cpus = calloc(nr_cpus, sizeof(char)); + if (!mon_cpus) + goto err; for (p = cpu_list; *p; ) { cpu = atoi(p);
Replace malloc with calloc and add memory allocating check of mon_cpus before used. Fixes: 7d0dc9576dc3 ("rtla/timerlat: Add --dma-latency option") Signed-off-by: jianchunfu <jianchunfu@cmss.chinamobile.com> --- V1 -> V2: using calloc, removing the memset and goto err instead of returning when allocation fails. --- tools/tracing/rtla/src/utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)