Skip to contentSkip to conversation

tracing: Replace kzalloc with kcalloc

PATCH In review Gustavo A. R. Silva 2 participants 3 messages Jan 15, 2019 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tracing: Replace kzalloc with kcalloc

Replace kzalloc() function with its 2-factor argument form, kcalloc().

This patch replaces cases of:

kzalloc(a * b, gfp)

with:
kcalloc(a * b, gfp)

This code was detected with the help of Coccinelle.

---
 kernel/trace/trace_probe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_probe.c +2 -2
index 9962cb5da8ac..57f0cbaf9c58 100644
@@ -429,7 +429,7 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
 			 parg->count);
 	}
 
-	code = tmp = kzalloc(sizeof(*code) * FETCH_INSN_MAX, GFP_KERNEL);
+	code = tmp = kcalloc(FETCH_INSN_MAX, sizeof(*code), GFP_KERNEL);
 	if (!code)
 		return -ENOMEM;
 	code[FETCH_INSN_MAX - 1].op = FETCH_OP_END;
@@ -501,7 +501,7 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
 	code->op = FETCH_OP_END;
 
 	/* Shrink down the code buffer */
-	parg->code = kzalloc(sizeof(*code) * (code - tmp + 1), GFP_KERNEL);
+	parg->code = kcalloc(code - tmp + 1, sizeof(*code), GFP_KERNEL);
 	if (!parg->code)
 		ret = -ENOMEM;
 	else
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 8 lines · On Mon, 14 Jan 2019 22:34:08 -0600 "Gustavo A. R. Silva"…

Replace kzalloc() function with its 2-factor argument form, kcalloc().

This patch replaces cases of:

kzalloc(a * b, gfp)

with:
kcalloc(a * b, gfp)

I think you meant:

kcalloc(a, b, gfp)

-- Steve

Quoted 30 lines

This code was detected with the help of Coccinelle.

---
 kernel/trace/trace_probe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_probe.c +2 -2
index 9962cb5da8ac..57f0cbaf9c58 100644
@@ -429,7 +429,7 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
 			 parg->count);
 	}
 
-	code = tmp = kzalloc(sizeof(*code) * FETCH_INSN_MAX, GFP_KERNEL);
+	code = tmp = kcalloc(FETCH_INSN_MAX, sizeof(*code), GFP_KERNEL);
 	if (!code)
 		return -ENOMEM;
 	code[FETCH_INSN_MAX - 1].op = FETCH_OP_END;
@@ -501,7 +501,7 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
 	code->op = FETCH_OP_END;
 
 	/* Shrink down the code buffer */
-	parg->code = kzalloc(sizeof(*code) * (code - tmp + 1), GFP_KERNEL);
+	parg->code = kcalloc(code - tmp + 1, sizeof(*code), GFP_KERNEL);
 	if (!parg->code)
 		ret = -ENOMEM;
 	else
#2 lore raw
Quoted 7 lines · Steven Rostedt
Quoted 4 lines · On Mon, 14 Jan 2019 22:34:08 -0600 "Gustavo A. R. Silva"…

Replace kzalloc() function with its 2-factor argument form, kcalloc().

This patch replaces cases of:

Quoted 9 lines
Quoted 4 lines

kzalloc(a * b, gfp)

with:
kcalloc(a * b, gfp)

I think you meant:

kcalloc(a, b, gfp)

Yep. copy/paste error. :/

Thanks
--
Gustavo

Quoted 33 lines

-- Steve

Quoted 30 lines

This code was detected with the help of Coccinelle.

---
  kernel/trace/trace_probe.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace_probe.c +2 -2
index 9962cb5da8ac..57f0cbaf9c58 100644
@@ -429,7 +429,7 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
  			 parg->count);
  	}
 
-	code = tmp = kzalloc(sizeof(*code) * FETCH_INSN_MAX, GFP_KERNEL);
+	code = tmp = kcalloc(FETCH_INSN_MAX, sizeof(*code), GFP_KERNEL);
  	if (!code)
  		return -ENOMEM;
  	code[FETCH_INSN_MAX - 1].op = FETCH_OP_END;
@@ -501,7 +501,7 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
  	code->op = FETCH_OP_END;
 
  	/* Shrink down the code buffer */
-	parg->code = kzalloc(sizeof(*code) * (code - tmp + 1), GFP_KERNEL);
+	parg->code = kcalloc(code - tmp + 1, sizeof(*code), GFP_KERNEL);
  	if (!parg->code)
  		ret = -ENOMEM;
  	else