vmalloc() and vzalloc() functions have now 2-factor multiplication
argument forms vmalloc_array() and vcalloc(), correspondingly.

Add alloc-with-multiplies checks for these new functions.

Link: https://github.com/KSPP/linux/issues/342
Signed-off-by: Gustavo A. R. Silva <gustavo...@kernel.org>
---
 scripts/checkpatch.pl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 7d16f863edf1..45265d0eee1b 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -7207,17 +7207,19 @@ sub process {
                            "Prefer $3(sizeof(*$1)...) over $3($4...)\n" . 
$herecurr);
                }
 
-# check for (kv|k)[mz]alloc with multiplies that could be 
kmalloc_array/kvmalloc_array/kvcalloc/kcalloc
+# check for (kv|k|v)[mz]alloc with multiplies that could be 
kmalloc_array/kvmalloc_array/vmalloc_array/kvcalloc/kcalloc/vcalloc
                if ($perl_version_ok &&
                    defined $stat &&
-                   $stat =~ 
/^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/)
 {
+                   $stat =~ 
/^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k|v)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,?/)
 {
                        my $oldfunc = $3;
                        my $a1 = $4;
                        my $a2 = $10;
                        my $newfunc = "kmalloc_array";
                        $newfunc = "kvmalloc_array" if ($oldfunc eq "kvmalloc");
+                       $newfunc = "vmalloc_array" if ($oldfunc eq "vmalloc");
                        $newfunc = "kvcalloc" if ($oldfunc eq "kvzalloc");
                        $newfunc = "kcalloc" if ($oldfunc eq "kzalloc");
+                       $newfunc = "vcalloc" if ($oldfunc eq "vzalloc");
                        my $r1 = $a1;
                        my $r2 = $a2;
                        if ($a1 =~ /^sizeof\s*\S/) {
@@ -7233,7 +7235,7 @@ sub process {
                                         "Prefer $newfunc over $oldfunc with 
multiply\n" . $herectx) &&
                                    $cnt == 1 &&
                                    $fix) {
-                                       $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;
+                                       $fixed[$fixlinenr] =~ 
s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*((?:kv|k|v)[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1
 . ' = ' . "$newfunc(" . trim($r1) . ', ' . trim($r2)/e;
                                }
                        }
                }
-- 
2.34.1

Reply via email to