| From d95e9124114a37788f45df831eca15582dd156aa Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 15 Dec 2020 20:45:02 -0800 |
| Subject: checkpatch: fix unescaped left brace |
| |
| From: Dwaipayan Ray <dwaipayanray1@gmail.com> |
| |
| [ Upstream commit 03f4935135b9efeb780b970ba023c201f81cf4e6 ] |
| |
| There is an unescaped left brace in a regex in OPEN_BRACE check. This |
| throws a runtime error when checkpatch is run with --fix flag and the |
| OPEN_BRACE check is executed. |
| |
| Fix it by escaping the left brace. |
| |
| Link: https://lkml.kernel.org/r/20201115202928.81955-1-dwaipayanray1@gmail.com |
| Fixes: 8d1824780f2f ("checkpatch: add --fix option for a couple OPEN_BRACE misuses") |
| Signed-off-by: Dwaipayan Ray <dwaipayanray1@gmail.com> |
| Acked-by: Joe Perches <joe@perches.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| scripts/checkpatch.pl | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl |
| index 8835a4775d205..67a6a8a9b6722 100755 |
| --- a/scripts/checkpatch.pl |
| +++ b/scripts/checkpatch.pl |
| @@ -3580,7 +3580,7 @@ sub process { |
| $fix) { |
| fix_delete_line($fixlinenr, $rawline); |
| my $fixed_line = $rawline; |
| - $fixed_line =~ /(^..*$Type\s*$Ident\(.*\)\s*){(.*)$/; |
| + $fixed_line =~ /(^..*$Type\s*$Ident\(.*\)\s*)\{(.*)$/; |
| my $line1 = $1; |
| my $line2 = $2; |
| fix_insert_line($fixlinenr, ltrim($line1)); |
| -- |
| 2.27.0 |
| |
