diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 24 | ||||
| -rwxr-xr-x | scripts/gcc-x86_64-has-stack-protector.sh | 2 |
2 files changed, 20 insertions, 6 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 17a3a6d1785c..1dcd4ed37103 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -60,6 +60,8 @@ my $spelling_file = "$D/spelling.txt"; my $codespell = 0; my $codespellfile = "/usr/share/codespell/dictionary.txt"; my $color = 1; +my $qca_sign_off = 0; +my $codeaurora_sign_off = 0; sub help { my ($exitcode) = @_; @@ -2429,10 +2431,16 @@ sub process { "email address '$email' might be better as '$suggested_email$comment'\n" . $herecurr); } } - if ($chk_author && $line =~ /^\s*signed-off-by:.*(quicinc|qualcomm)\.com/i) { - WARN("BAD_SIGN_OFF", - "invalid Signed-off-by identity\n" . $line ); - } + if ($chk_author) { + if ($line =~ /^\s*signed-off-by:.*qca\.qualcomm\.com/i) { + $qca_sign_off = 1; + } elsif ($line =~ /^\s*signed-off-by:.*codeaurora\.org/i) { + $codeaurora_sign_off = 1; + } elsif ($line =~ /^\s*signed-off-by:.*(quicinc|qualcomm)\.com/i) { + WARN("BAD_SIGN_OFF", + "invalid Signed-off-by identity\n" . $line ); + } + } # Check for duplicate signatures my $sig_nospace = $line; @@ -2558,7 +2566,8 @@ sub process { } #check the patch for invalid author credentials - if ($chk_author && $line =~ /^From:.*(quicinc|qualcomm)\.com/) { + if ($chk_author && !($line =~ /^From:.*qca\.qualcomm\.com/) && + $line =~ /^From:.*(quicinc|qualcomm)\.com/) { WARN("BAD_AUTHOR", "invalid author identity\n" . $line ); } @@ -6042,6 +6051,11 @@ sub process { } } + if ($chk_author && $qca_sign_off && !$codeaurora_sign_off) { + WARN("BAD_SIGN_OFF", + "QCA Signed-off-by requires CODEAURORA Signed-off-by\n" . $line ); + } + # If we have no input at all, then there is nothing to report on # so just keep quiet. if ($#rawlines == -1) { diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh index 973e8c141567..17867e723a51 100755 --- a/scripts/gcc-x86_64-has-stack-protector.sh +++ b/scripts/gcc-x86_64-has-stack-protector.sh @@ -1,6 +1,6 @@ #!/bin/sh -echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null | grep -q "%gs" +echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs" if [ "$?" -eq "0" ] ; then echo y else |