1 files changed, 10 insertions, 3 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b1befa2cec26..d2c074feaa7d 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -5922,7 +5922,8 @@ sub process {
 
 # check for k[mz]alloc with multiplies that could be kmalloc_array/kcalloc
                 if ($^V && $^V ge 5.10.0 &&
-                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) {
+                    defined $stat &&
+                    $stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) {
                         my $oldfunc = $3;
                         my $a1 = $4;
                         my $a2 = $10;
@@ -5936,11 +5937,17 @@ sub process {
                         }
                         if ($r1 !~ /^sizeof\b/ && $r2 =~ /^sizeof\s*\S/ &&
                             !($r1 =~ /^$Constant$/ || $r1 =~ /^[A-Z_][A-Z0-9_]*$/)) {
+                                my $ctx = '';
+                                my $herectx = $here . "\n";
+                                my $cnt = statement_rawlines($stat);
+                                for (my $n = 0; $n < $cnt; $n++) {
+                                        $herectx .= raw_line($linenr, $n) . "\n";
+                                }
                                 if (WARN("ALLOC_WITH_MULTIPLY",
-                                         "Prefer $newfunc over $oldfunc with multiply\n" . $herecurr) &&
+                                         "Prefer $newfunc over $oldfunc with multiply\n" . $herectx) &&
+                                    $cnt == 1 &&
                                     $fix) {
                                         $fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . trim($r1) . ', ' . trim($r2)/e;
-
                                 }
                         }
                 }