Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
checkpatch: Suggest kmalloc_obj family for sizeof allocations
To support shifting away from sized allocation towards typed
allocations, suggest the kmalloc_obj family of macros when a sizeof() is
present in the argument lists.
Link: https://patch.msgid.link/20251203233036.3212363-2-kees@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
+33
-6
+33
-6
scripts/checkpatch.pl
+33
-6
scripts/checkpatch.pl
···
7258
7258
"Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr);
7259
7259
}
7260
7260
7261
-
# check for (kv|k)[mz]alloc with multiplies that could be kmalloc_array/kvmalloc_array/kvcalloc/kcalloc
7261
+
# check for (kv|k)[mz]alloc that could be kmalloc_obj/kvmalloc_obj/kzalloc_obj/kvzalloc_obj
7262
+
if ($perl_version_ok &&
7263
+
defined $stat &&
7264
+
$stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*,/) {
7265
+
my $oldfunc = $3;
7266
+
my $a1 = $4;
7267
+
my $newfunc = "kmalloc_obj";
7268
+
$newfunc = "kvmalloc_obj" if ($oldfunc eq "kvmalloc");
7269
+
$newfunc = "kvzalloc_obj" if ($oldfunc eq "kvzalloc");
7270
+
$newfunc = "kzalloc_obj" if ($oldfunc eq "kzalloc");
7271
+
7272
+
if ($a1 =~ s/^sizeof\s*\S\(?([^\)]*)\)?$/$1/) {
7273
+
my $cnt = statement_rawlines($stat);
7274
+
my $herectx = get_stat_here($linenr, $cnt, $here);
7275
+
7276
+
if (WARN("ALLOC_WITH_SIZEOF",
7277
+
"Prefer $newfunc over $oldfunc with sizeof\n" . $herectx) &&
7278
+
$cnt == 1 &&
7279
+
$fix) {
7280
+
$fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*,/$1 = $newfunc($a1,/;
7281
+
}
7282
+
}
7283
+
}
7284
+
7285
+
7286
+
# check for (kv|k)[mz]alloc with multiplies that could be kmalloc_objs/kvmalloc_objs/kzalloc_objs/kvzalloc_objs
7262
7287
if ($perl_version_ok &&
7263
7288
defined $stat &&
7264
7289
$stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) {
7265
7290
my $oldfunc = $3;
7266
7291
my $a1 = $4;
7267
7292
my $a2 = $10;
7268
-
my $newfunc = "kmalloc_array";
7269
-
$newfunc = "kvmalloc_array" if ($oldfunc eq "kvmalloc");
7270
-
$newfunc = "kvcalloc" if ($oldfunc eq "kvzalloc");
7271
-
$newfunc = "kcalloc" if ($oldfunc eq "kzalloc");
7293
+
my $newfunc = "kmalloc_objs";
7294
+
$newfunc = "kvmalloc_objs" if ($oldfunc eq "kvmalloc");
7295
+
$newfunc = "kvzalloc_objs" if ($oldfunc eq "kvzalloc");
7296
+
$newfunc = "kzalloc_objs" if ($oldfunc eq "kzalloc");
7272
7297
my $r1 = $a1;
7273
7298
my $r2 = $a2;
7274
7299
if ($a1 =~ /^sizeof\s*\S/) {
···
7309
7284
"Prefer $newfunc over $oldfunc with multiply\n" . $herectx) &&
7310
7285
$cnt == 1 &&
7311
7286
$fix) {
7312
-
$fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . trim($r1) . ', ' . trim($r2)/e;
7287
+
my $sized = trim($r2);
7288
+
$sized =~ s/^sizeof\s*\S\(?([^\)]*)\)?$/$1/;
7289
+
$fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . $sized . ', ' . trim($r1)/e;
7313
7290
}
7314
7291
}
7315
7292
}