import clang-12.0.1-4.module+el8.5.0+13246+cefb5d4c

2021-11-18 11:30:19 -05:00 · 2021-11-18 11:30:19 -05:00 · 3f8d12f68a
commit 3f8d12f68a
parent aa060c22b8
4 changed files with 17085 additions and 1 deletions
--- a/SOURCES/0001-Confusable-identifiers-detection.patch
+++ b/SOURCES/0001-Confusable-identifiers-detection.patch
--- a/SOURCES/0002-Misleading-bidirectional-detection.patch
+++ b/SOURCES/0002-Misleading-bidirectional-detection.patch
@ -0,0 +1,332 @@
 From 9613c86f0427be88ee43bddb7ae7cde74c1157ac Mon Sep 17 00:00:00 2001
 From: serge-sans-paille <sguelton@redhat.com>
 Date: Thu, 4 Nov 2021 11:11:53 +0100
 Subject: [PATCH 2/3] Misleading bidirectional detection
 Differential Revision: https://reviews.llvm.org/D112913
 ---
 clang-tools-extra/clang-tidy/misc/CMakeLists.txt   |   1 +
 .../clang-tidy/misc/MiscTidyModule.cpp             |   3 +
 .../clang-tidy/misc/MisleadingBidirectional.cpp    | 131 +++++++++++++++++++++
 .../clang-tidy/misc/MisleadingBidirectional.h      |  38 ++++++
 clang-tools-extra/docs/ReleaseNotes.rst            |   5 +
 clang-tools-extra/docs/clang-tidy/checks/list.rst  |   3 +-
 .../checks/misc-misleading-bidirectional.rst       |  21 ++++
 .../checkers/misc-misleading-bidirectional.cpp     |  31 +++++
 8 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
 create mode 100644 clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h
 create mode 100644 clang-tools-extra/docs/clang-tidy/checks/misc-misleading-bidirectional.rst
 create mode 100644 clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp
 diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
 index d438a47..d6bb718 100644
 --- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
 +++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
@@ -11,6 +11,7 @@ add_clang_library(clangTidyMiscModule
   DefinitionsInHeadersCheck.cpp
   Homoglyph.cpp
   MiscTidyModule.cpp
 +  MisleadingBidirectional.cpp
   MisplacedConstCheck.cpp
   NewDeleteOverloadsCheck.cpp
   NoRecursionCheck.cpp
 diff --git a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
 index 5c7bd0c..bb5fde2 100644
 --- a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
 +++ b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
@@ -11,6 +11,7 @@
 #include "../ClangTidyModuleRegistry.h"
 #include "DefinitionsInHeadersCheck.h"
 #include "Homoglyph.h"
 +#include "MisleadingBidirectional.h"
 #include "MisplacedConstCheck.h"
 #include "NewDeleteOverloadsCheck.h"
 #include "NoRecursionCheck.h"
@@ -35,6 +36,8 @@ public:
     CheckFactories.registerCheck<DefinitionsInHeadersCheck>(
         "misc-definitions-in-headers");
     CheckFactories.registerCheck<Homoglyph>("misc-homoglyph");
 +    CheckFactories.registerCheck<MisleadingBidirectionalCheck>(
 +        "misc-misleading-bidirectional");
     CheckFactories.registerCheck<MisplacedConstCheck>("misc-misplaced-const");
     CheckFactories.registerCheck<NewDeleteOverloadsCheck>(
         "misc-new-delete-overloads");
 diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
 new file mode 100644
 index 0000000..7a2f06b
 --- /dev/null
 +++ b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.cpp
@@ -0,0 +1,131 @@
 +//===--- MisleadingBidirectional.cpp - clang-tidy -------------------------===//
 +//
 +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 +// See https://llvm.org/LICENSE.txt for license information.
 +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 +//
 +//===----------------------------------------------------------------------===//
 +
 +#include "MisleadingBidirectional.h"
 +
 +#include "clang/Frontend/CompilerInstance.h"
 +#include "clang/Lex/Preprocessor.h"
 +#include "llvm/Support/ConvertUTF.h"
 +
 +using namespace clang;
 +
 +static bool containsMisleadingBidi(StringRef Buffer,
 +                                   bool HonorLineBreaks = true) {
 +  const char *CurPtr = Buffer.begin();
 +  unsigned EmbeddingOverride = 0, Isolate = 0;
 +  unsigned i = 0;
 +
 +  enum {
 +    LS = 0x2028,
 +    PS = 0x2029,
 +    RLO = 0x202E,
 +    RLE = 0x202B,
 +    LRO = 0x202D,
 +    LRE = 0x202A,
 +    PDF = 0x202C,
 +    RLI = 0x2067,
 +    LRI = 0x2066,
 +    FSI = 0x2068,
 +    PDI = 0x2069
 +  };
 +
 +  // Scan each character while maintaining a count of opened bidi context.
 +  // RLO/RLE/LRO/LRE all are closed by PDF while RLI LRI and FSI are closed by
 +  // PDI. New lines reset the context count. Extra PDF / PDI are ignored.
 +  //
 +  // Warn if we end up with an unclosed context.
 +  while (CurPtr < Buffer.end()) {
 +    ++i;
 +    unsigned char C = *CurPtr;
 +    if (isASCII(C)) {
 +      ++CurPtr;
 +      // Line break: https://www.unicode.org/reports/tr14/tr14-32.html
 +      if (C == '\n' || C == '\r' || C == '\f' || C == '\v' ||
 +          C == 0x85 /*next line*/)
 +        EmbeddingOverride = Isolate = 0;
 +      continue;
 +    }
 +    llvm::UTF32 CodePoint;
 +    llvm::ConversionResult Result = llvm::convertUTF8Sequence(
 +        (const llvm::UTF8 **)&CurPtr, (const llvm::UTF8 *)Buffer.end(),
 +        &CodePoint, llvm::strictConversion);
 +
 +    // If conversion fails, utf-8 is designed so that we can just try next char.
 +    if (Result != llvm::conversionOK) {
 +      ++CurPtr;
 +      continue;
 +    }
 +
 +    if (CodePoint == RLO || CodePoint == RLE || CodePoint == LRO ||
 +        CodePoint == LRE)
 +      EmbeddingOverride += 1;
 +    else if (CodePoint == PDF)
 +      EmbeddingOverride = std::min(EmbeddingOverride - 1, EmbeddingOverride);
 +    else if (CodePoint == RLI || CodePoint == LRI || CodePoint == FSI)
 +      Isolate += 1;
 +    else if (CodePoint == PDI)
 +      Isolate = std::min(Isolate - 1, Isolate);
 +    // Line break: https://www.unicode.org/reports/tr14/tr14-32.html
 +    else if (CodePoint == LS || CodePoint == PS)
 +      EmbeddingOverride = Isolate = 0;
 +  }
 +  return EmbeddingOverride != 0 || Isolate != 0;
 +}
 +
 +class clang::tidy::misc::MisleadingBidirectionalCheck::
 +    MisleadingBidirectionalHandler : public CommentHandler {
 +public:
 +  MisleadingBidirectionalHandler(MisleadingBidirectionalCheck &Check,
 +                                 llvm::Optional<std::string> User)
 +      : Check(Check) {}
 +
 +  bool HandleComment(Preprocessor &PP, SourceRange Range) override {
 +    // FIXME: check that we are in a /* */ comment
 +    StringRef Text =
 +        Lexer::getSourceText(CharSourceRange::getCharRange(Range),
 +                             PP.getSourceManager(), PP.getLangOpts());
 +
 +    if (containsMisleadingBidi(Text, true))
 +      Check.diag(
 +          Range.getBegin(),
 +          "comment contains misleading bidirectional Unicode characters");
 +    return false;
 +  }
 +
 +private:
 +  MisleadingBidirectionalCheck &Check;
 +};
 +
 +clang::tidy::misc::MisleadingBidirectionalCheck::MisleadingBidirectionalCheck(
 +    StringRef Name, ClangTidyContext *Context)
 +    : ClangTidyCheck(Name, Context),
 +      Handler(std::make_unique<MisleadingBidirectionalHandler>(
 +          *this, Context->getOptions().User)) {}
 +
 +clang::tidy::misc::MisleadingBidirectionalCheck::
 +    ~MisleadingBidirectionalCheck() = default;
 +
 +void clang::tidy::misc::MisleadingBidirectionalCheck::registerPPCallbacks(
 +    const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) {
 +  PP->addCommentHandler(Handler.get());
 +}
 +
 +void clang::tidy::misc::MisleadingBidirectionalCheck::check(
 +    const ast_matchers::MatchFinder::MatchResult &Result) {
 +  if (const auto *SL = Result.Nodes.getNodeAs<StringLiteral>("strlit")) {
 +    StringRef Literal = SL->getBytes();
 +    if (containsMisleadingBidi(Literal, false))
 +      diag(SL->getBeginLoc(), "string literal contains misleading "
 +                              "bidirectional Unicode characters");
 +  }
 +}
 +
 +void clang::tidy::misc::MisleadingBidirectionalCheck::registerMatchers(
 +    ast_matchers::MatchFinder *Finder) {
 +  Finder->addMatcher(ast_matchers::stringLiteral().bind("strlit"), this);
 +}
 diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h
 new file mode 100644
 index 0000000..18e7060
 --- /dev/null
 +++ b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectional.h
@@ -0,0 +1,38 @@
 +//===--- MisleadingBidirectionalCheck.h - clang-tidy ------------*- C++ -*-===//
 +//
 +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 +// See https://llvm.org/LICENSE.txt for license information.
 +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 +//
 +//===----------------------------------------------------------------------===//
 +
 +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGBIDIRECTIONALCHECK_H
 +#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGBIDIRECTIONALCHECK_H
 +
 +#include "../ClangTidyCheck.h"
 +
 +namespace clang {
 +namespace tidy {
 +namespace misc {
 +
 +class MisleadingBidirectionalCheck : public ClangTidyCheck {
 +public:
 +  MisleadingBidirectionalCheck(StringRef Name, ClangTidyContext *Context);
 +  ~MisleadingBidirectionalCheck();
 +
 +  void registerPPCallbacks(const SourceManager &SM, Preprocessor *PP,
 +                           Preprocessor *ModuleExpanderPP) override;
 +
 +  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
 +  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
 +
 +private:
 +  class MisleadingBidirectionalHandler;
 +  std::unique_ptr<MisleadingBidirectionalHandler> Handler;
 +};
 +
 +} // namespace misc
 +} // namespace tidy
 +} // namespace clang
 +
 +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGBIDIRECTIONALCHECK_H
 diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst
 index e4ad7b9..546d544 100644
 --- a/clang-tools-extra/docs/ReleaseNotes.rst
 +++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -326,6 +326,11 @@ New checks
   Detects confusable unicode identifiers.
 +- New :doc:`misc-misleading-bidirectional <clang-tidy/checks/misc-misleading-bidirectional>` check.
 +
 +  Inspect string literal and comments for unterminated bidirectional Unicode
 +  characters.
 +
 New check aliases
 ^^^^^^^^^^^^^^^^^
 diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst
 index 47ff5b7..977867d 100644
 --- a/clang-tools-extra/docs/clang-tidy/checks/list.rst
 +++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst
@@ -202,7 +202,8 @@ Clang-Tidy Checks
    `llvmlibc-implementation-in-namespace <llvmlibc-implementation-in-namespace.html>`_,
    `llvmlibc-restrict-system-libc-headers <llvmlibc-restrict-system-libc-headers.html>`_, "Yes"
    `misc-definitions-in-headers <misc-definitions-in-headers.html>`_, "Yes"
 -   `misc-homoglyph <misc-homoglyph.html>`_, "Yes"
 +   `misc-homoglyph <misc-homoglyph.html>`_,
 +   `misc-misleading-bidirectional <misc-misleading-bidirectional.html>`_,
    `misc-misplaced-const <misc-misplaced-const.html>`_,
    `misc-new-delete-overloads <misc-new-delete-overloads.html>`_,
    `misc-no-recursion <misc-no-recursion.html>`_,
 diff --git a/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-bidirectional.rst b/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-bidirectional.rst
 new file mode 100644
 index 0000000..16ffc97
 --- /dev/null
 +++ b/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-bidirectional.rst
@@ -0,0 +1,21 @@
 +.. title:: clang-tidy - misc-misleading-bidirectional
 +
 +misc-misleading-bidirectional
 +=============================
 +
 +Warn about unterminated bidirectional unicode sequence, detecting potential attack
 +as described in the `Trojan Source <https://www.trojansource.codes>`_ attack.
 +
 +Example:
 +
 +.. code-block:: c++
 +
 +    #include <iostream>
 +
 +    int main() {
 +        bool isAdmin = false;
 +        /*‮ } ⁦if (isAdmin)⁩ ⁦ begin admins only */
 +            std::cout << "You are an admin.\n";
 +        /* end admins only ‮ { ⁦*/
 +        return 0;
 +    }
 diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp
 new file mode 100644
 index 0000000..12fdf63
 --- /dev/null
 +++ b/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-bidirectional.cpp
@@ -0,0 +1,31 @@
 +// RUN: %check_clang_tidy %s misc-misleading-bidirectional %t
 +
 +void func(void) {
 +  int admin = 0;
 +  /*‮ }⁦if(admin)⁩ ⁦ begin*/
 +  // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: comment contains misleading bidirectional Unicode characters [misc-misleading-bidirectional]
 +  const char msg[] = "‮⁦if(admin)⁩ ⁦tes";
 +  // CHECK-MESSAGES: :[[@LINE-1]]:22: warning: string literal contains misleading bidirectional Unicode characters [misc-misleading-bidirectional]
 +}
 +
 +void all_fine(void) {
 +  char valid[] = "some‮valid‬sequence";
 +  /* EOL ends bidi‮ sequence
 +   * end it's fine to do so.
 +   * EOL ends ⁧isolate too
 +   */
 +}
 +
 +int invalid_utf_8(void) {
 +  bool isAdmin = false;
 +
 +  // the comment below contains an invalid utf8 character, but should still be
 +  // processed.
 +
 +  // CHECK-MESSAGES: :[[@LINE+1]]:3: warning: comment contains misleading bidirectional Unicode characters [misc-misleading-bidirectional]
 +  /*‮ } ⁦if (isAdmin)⁩ ⁦ begin admins only */
 +  return 1;
 +  /* end admins only ‮ { ⁦*/
 +  // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: comment contains misleading bidirectional Unicode characters [misc-misleading-bidirectional]
 +  return 0;
 +}
 -- 
 1.8.3.1
--- a/SOURCES/0003-Misleading-unicode-identifier-detection-pass.patch
+++ b/SOURCES/0003-Misleading-unicode-identifier-detection-pass.patch
@ -0,0 +1,355 @@
 From d214ffa5e0bea78f85f61e96dc1071e4ed4ac69f Mon Sep 17 00:00:00 2001
 From: serge-sans-paille <sguelton@redhat.com>
 Date: Fri, 15 Oct 2021 15:18:52 +0200
 Subject: [PATCH 3/3] Misleading unicode identifier detection pass
 Detect when an identifier contains some Right-To-Left characters.
 This pass relates to https://trojansource.codes/
 Differential Revision: https://reviews.llvm.org/D112914
 ---
 clang-tools-extra/clang-tidy/misc/CMakeLists.txt   |   1 +
 .../clang-tidy/misc/MiscTidyModule.cpp             |   3 +
 .../clang-tidy/misc/MisleadingIdentifier.cpp       | 163 +++++++++++++++++++++
 .../clang-tidy/misc/MisleadingIdentifier.h         |  31 ++++
 clang-tools-extra/docs/ReleaseNotes.rst            |   9 ++
 clang-tools-extra/docs/clang-tidy/checks/list.rst  |   1 +
 .../checks/misc-misleading-identifier.rst          |  23 +++
 .../checkers/misc-misleading-identifier.cpp        |  15 ++
 8 files changed, 246 insertions(+)
 create mode 100644 clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
 create mode 100644 clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h
 create mode 100644 clang-tools-extra/docs/clang-tidy/checks/misc-misleading-identifier.rst
 create mode 100644 clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp
 diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
 index d6bb718..1974245 100644
 --- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
 +++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt
@@ -12,6 +12,7 @@ add_clang_library(clangTidyMiscModule
   Homoglyph.cpp
   MiscTidyModule.cpp
   MisleadingBidirectional.cpp
 +  MisleadingIdentifier.cpp
   MisplacedConstCheck.cpp
   NewDeleteOverloadsCheck.cpp
   NoRecursionCheck.cpp
 diff --git a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
 index bb5fde2..b484db8 100644
 --- a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
 +++ b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp
@@ -12,6 +12,7 @@
 #include "DefinitionsInHeadersCheck.h"
 #include "Homoglyph.h"
 #include "MisleadingBidirectional.h"
 +#include "MisleadingIdentifier.h"
 #include "MisplacedConstCheck.h"
 #include "NewDeleteOverloadsCheck.h"
 #include "NoRecursionCheck.h"
@@ -38,6 +39,8 @@ public:
     CheckFactories.registerCheck<Homoglyph>("misc-homoglyph");
     CheckFactories.registerCheck<MisleadingBidirectionalCheck>(
         "misc-misleading-bidirectional");
 +    CheckFactories.registerCheck<MisleadingIdentifierCheck>(
 +        "misc-misleading-identifier");
     CheckFactories.registerCheck<MisplacedConstCheck>("misc-misplaced-const");
     CheckFactories.registerCheck<NewDeleteOverloadsCheck>(
         "misc-new-delete-overloads");
 diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
 new file mode 100644
 index 0000000..f9b3075
 --- /dev/null
 +++ b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.cpp
@@ -0,0 +1,163 @@
 +//===--- MisleadingIdentifier.cpp - clang-tidy-----------------------------===//
 +//
 +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 +// See https://llvm.org/LICENSE.txt for license information.
 +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 +//
 +//===----------------------------------------------------------------------===//
 +
 +#include "MisleadingIdentifier.h"
 +
 +#include "clang/Frontend/CompilerInstance.h"
 +#include "llvm/Support/ConvertUTF.h"
 +
 +namespace clang {
 +namespace tidy {
 +namespace misc {
 +
 +// See https://www.unicode.org/Public/14.0.0/ucd/extracted/DerivedBidiClass.txt
 +static bool isUnassignedAL(llvm::UTF32 CP) {
 +  return (0x0600 <= CP && CP <= 0x07BF) || (0x0860 <= CP && CP <= 0x08FF) ||
 +         (0xFB50 <= CP && CP <= 0xFDCF) || (0xFDF0 <= CP && CP <= 0xFDFF) ||
 +         (0xFE70 <= CP && CP <= 0xFEFF) ||
 +         (0x00010D00 <= CP && CP <= 0x00010D3F) ||
 +         (0x00010F30 <= CP && CP <= 0x00010F6F) ||
 +         (0x0001EC70 <= CP && CP <= 0x0001ECBF) ||
 +         (0x0001ED00 <= CP && CP <= 0x0001ED4F) ||
 +         (0x0001EE00 <= CP && CP <= 0x0001EEFF);
 +}
 +
 +// See https://www.unicode.org/Public/14.0.0/ucd/extracted/DerivedBidiClass.txt
 +static bool isUnassignedR(llvm::UTF32 CP) {
 +  return (0x0590 <= CP && CP <= 0x05FF) || (0x07C0 <= CP && CP <= 0x085F) ||
 +         (0xFB1D <= CP && CP <= 0xFB4F) ||
 +         (0x00010800 <= CP && CP <= 0x00010CFF) ||
 +         (0x00010D40 <= CP && CP <= 0x00010F2F) ||
 +         (0x00010F70 <= CP && CP <= 0x00010FFF) ||
 +         (0x0001E800 <= CP && CP <= 0x0001EC6F) ||
 +         (0x0001ECC0 <= CP && CP <= 0x0001ECFF) ||
 +         (0x0001ED50 <= CP && CP <= 0x0001EDFF) ||
 +         (0x0001EF00 <= CP && CP <= 0x0001EFFF);
 +}
 +
 +// See https://www.unicode.org/Public/14.0.0/ucd/extracted/DerivedBidiClass.txt
 +static bool isR(llvm::UTF32 CP) {
 +  return (CP == 0x0590) || (CP == 0x05BE) || (CP == 0x05C0) || (CP == 0x05C3) ||
 +         (CP == 0x05C6) || (0x05C8 <= CP && CP <= 0x05CF) ||
 +         (0x05D0 <= CP && CP <= 0x05EA) || (0x05EB <= CP && CP <= 0x05EE) ||
 +         (0x05EF <= CP && CP <= 0x05F2) || (0x05F3 <= CP && CP <= 0x05F4) ||
 +         (0x05F5 <= CP && CP <= 0x05FF) || (0x07C0 <= CP && CP <= 0x07C9) ||
 +         (0x07CA <= CP && CP <= 0x07EA) || (0x07F4 <= CP && CP <= 0x07F5) ||
 +         (CP == 0x07FA) || (0x07FB <= CP && CP <= 0x07FC) ||
 +         (0x07FE <= CP && CP <= 0x07FF) || (0x0800 <= CP && CP <= 0x0815) ||
 +         (CP == 0x081A) || (CP == 0x0824) || (CP == 0x0828) ||
 +         (0x082E <= CP && CP <= 0x082F) || (0x0830 <= CP && CP <= 0x083E) ||
 +         (CP == 0x083F) || (0x0840 <= CP && CP <= 0x0858) ||
 +         (0x085C <= CP && CP <= 0x085D) || (CP == 0x085E) || (CP == 0x085F) ||
 +         (CP == 0x200F) || (CP == 0xFB1D) || (0xFB1F <= CP && CP <= 0xFB28) ||
 +         (0xFB2A <= CP && CP <= 0xFB36) || (CP == 0xFB37) ||
 +         (0xFB38 <= CP && CP <= 0xFB3C) || (CP == 0xFB3D) || (CP == 0xFB3E) ||
 +         (CP == 0xFB3F) || (0xFB40 <= CP && CP <= 0xFB41) || (CP == 0xFB42) ||
 +         (0xFB43 <= CP && CP <= 0xFB44) || (CP == 0xFB45) ||
 +         (0xFB46 <= CP && CP <= 0xFB4F) || (0x10800 <= CP && CP <= 0x10805) ||
 +         (0x10806 <= CP && CP <= 0x10807) || (CP == 0x10808) ||
 +         (CP == 0x10809) || (0x1080A <= CP && CP <= 0x10835) ||
 +         (CP == 0x10836) || (0x10837 <= CP && CP <= 0x10838) ||
 +         (0x10839 <= CP && CP <= 0x1083B) || (CP == 0x1083C) ||
 +         (0x1083D <= CP && CP <= 0x1083E) || (0x1083F <= CP && CP <= 0x10855) ||
 +         (CP == 0x10856) || (CP == 0x10857) ||
 +         (0x10858 <= CP && CP <= 0x1085F) || (0x10860 <= CP && CP <= 0x10876) ||
 +         (0x10877 <= CP && CP <= 0x10878) || (0x10879 <= CP && CP <= 0x1087F) ||
 +         (0x10880 <= CP && CP <= 0x1089E) || (0x1089F <= CP && CP <= 0x108A6) ||
 +         (0x108A7 <= CP && CP <= 0x108AF) || (0x108B0 <= CP && CP <= 0x108DF) ||
 +         (0x108E0 <= CP && CP <= 0x108F2) || (CP == 0x108F3) ||
 +         (0x108F4 <= CP && CP <= 0x108F5) || (0x108F6 <= CP && CP <= 0x108FA) ||
 +         (0x108FB <= CP && CP <= 0x108FF) || (0x10900 <= CP && CP <= 0x10915) ||
 +         (0x10916 <= CP && CP <= 0x1091B) || (0x1091C <= CP && CP <= 0x1091E) ||
 +         (0x10920 <= CP && CP <= 0x10939) || (0x1093A <= CP && CP <= 0x1093E) ||
 +         (CP == 0x1093F) || (0x10940 <= CP && CP <= 0x1097F) ||
 +         (0x10980 <= CP && CP <= 0x109B7) || (0x109B8 <= CP && CP <= 0x109BB) ||
 +         (0x109BC <= CP && CP <= 0x109BD) || (0x109BE <= CP && CP <= 0x109BF) ||
 +         (0x109C0 <= CP && CP <= 0x109CF) || (0x109D0 <= CP && CP <= 0x109D1) ||
 +         (0x109D2 <= CP && CP <= 0x109FF) || (CP == 0x10A00) ||
 +         (CP == 0x10A04) || (0x10A07 <= CP && CP <= 0x10A0B) ||
 +         (0x10A10 <= CP && CP <= 0x10A13) || (CP == 0x10A14) ||
 +         (0x10A15 <= CP && CP <= 0x10A17) || (CP == 0x10A18) ||
 +         (0x10A19 <= CP && CP <= 0x10A35) || (0x10A36 <= CP && CP <= 0x10A37) ||
 +         (0x10A3B <= CP && CP <= 0x10A3E) || (0x10A40 <= CP && CP <= 0x10A48) ||
 +         (0x10A49 <= CP && CP <= 0x10A4F) || (0x10A50 <= CP && CP <= 0x10A58) ||
 +         (0x10A59 <= CP && CP <= 0x10A5F) || (0x10A60 <= CP && CP <= 0x10A7C) ||
 +         (0x10A7D <= CP && CP <= 0x10A7E) || (CP == 0x10A7F) ||
 +         (0x10A80 <= CP && CP <= 0x10A9C) || (0x10A9D <= CP && CP <= 0x10A9F) ||
 +         (0x10AA0 <= CP && CP <= 0x10ABF) || (0x10AC0 <= CP && CP <= 0x10AC7) ||
 +         (CP == 0x10AC8) || (0x10AC9 <= CP && CP <= 0x10AE4) ||
 +         (0x10AE7 <= CP && CP <= 0x10AEA) || (0x10AEB <= CP && CP <= 0x10AEF) ||
 +         (0x10AF0 <= CP && CP <= 0x10AF6) || (0x10AF7 <= CP && CP <= 0x10AFF) ||
 +         (0x10B00 <= CP && CP <= 0x10B35) || (0x10B36 <= CP && CP <= 0x10B38) ||
 +         (0x10B40 <= CP && CP <= 0x10B55) || (0x10B56 <= CP && CP <= 0x10B57) ||
 +         (0x10B58 <= CP && CP <= 0x10B5F) || (0x10B60 <= CP && CP <= 0x10B72) ||
 +         (0x10B73 <= CP && CP <= 0x10B77) || (0x10B78 <= CP && CP <= 0x10B7F) ||
 +         (0x10B80 <= CP && CP <= 0x10B91) || (0x10B92 <= CP && CP <= 0x10B98) ||
 +         (0x10B99 <= CP && CP <= 0x10B9C) || (0x10B9D <= CP && CP <= 0x10BA8) ||
 +         (0x10BA9 <= CP && CP <= 0x10BAF) || (0x10BB0 <= CP && CP <= 0x10BFF) ||
 +         (0x10C00 <= CP && CP <= 0x10C48) || (0x10C49 <= CP && CP <= 0x10C7F) ||
 +         (0x10C80 <= CP && CP <= 0x10CB2) || (0x10CB3 <= CP && CP <= 0x10CBF) ||
 +         (0x10CC0 <= CP && CP <= 0x10CF2) || (0x10CF3 <= CP && CP <= 0x10CF9) ||
 +         (0x10CFA <= CP && CP <= 0x10CFF) || (0x10D40 <= CP && CP <= 0x10E5F) ||
 +         (CP == 0x10E7F) || (0x10E80 <= CP && CP <= 0x10EA9) ||
 +         (CP == 0x10EAA) || (CP == 0x10EAD) ||
 +         (0x10EAE <= CP && CP <= 0x10EAF) || (0x10EB0 <= CP && CP <= 0x10EB1) ||
 +         (0x10EB2 <= CP && CP <= 0x10EFF) || (0x10F00 <= CP && CP <= 0x10F1C) ||
 +         (0x10F1D <= CP && CP <= 0x10F26) || (CP == 0x10F27) ||
 +         (0x10F28 <= CP && CP <= 0x10F2F) || (0x10F70 <= CP && CP <= 0x10F81) ||
 +         (0x10F86 <= CP && CP <= 0x10F89) || (0x10F8A <= CP && CP <= 0x10FAF) ||
 +         (0x10FB0 <= CP && CP <= 0x10FC4) || (0x10FC5 <= CP && CP <= 0x10FCB) ||
 +         (0x10FCC <= CP && CP <= 0x10FDF) || (0x10FE0 <= CP && CP <= 0x10FF6) ||
 +         (0x10FF7 <= CP && CP <= 0x10FFF) || (0x1E800 <= CP && CP <= 0x1E8C4) ||
 +         (0x1E8C5 <= CP && CP <= 0x1E8C6) || (0x1E8C7 <= CP && CP <= 0x1E8CF) ||
 +         (0x1E8D7 <= CP && CP <= 0x1E8FF) || (0x1E900 <= CP && CP <= 0x1E943) ||
 +         (CP == 0x1E94B) || (0x1E94C <= CP && CP <= 0x1E94F) ||
 +         (0x1E950 <= CP && CP <= 0x1E959) || (0x1E95A <= CP && CP <= 0x1E95D) ||
 +         (0x1E95E <= CP && CP <= 0x1E95F) || (0x1E960 <= CP && CP <= 0x1EC6F) ||
 +         (0x1ECC0 <= CP && CP <= 0x1ECFF) || (0x1ED50 <= CP && CP <= 0x1EDFF);
 +}
 +
 +static bool hasRTLCharacters(StringRef Buffer) {
 +  const char *CurPtr = Buffer.begin();
 +  const char *EndPtr = Buffer.end();
 +  while (CurPtr < EndPtr) {
 +    llvm::UTF32 CodePoint;
 +    llvm::ConversionResult Result = llvm::convertUTF8Sequence(
 +        (const llvm::UTF8 **)&CurPtr, (const llvm::UTF8 *)EndPtr, &CodePoint,
 +        llvm::strictConversion);
 +    if (Result != llvm::conversionOK)
 +      break;
 +    if (isUnassignedAL(CodePoint) || isUnassignedR(CodePoint) || isR(CodePoint))
 +      return true;
 +  }
 +  return false;
 +}
 +
 +MisleadingIdentifierCheck::MisleadingIdentifierCheck(StringRef Name,
 +                                                     ClangTidyContext *Context)
 +    : ClangTidyCheck(Name, Context) {}
 +
 +MisleadingIdentifierCheck::~MisleadingIdentifierCheck() = default;
 +
 +void MisleadingIdentifierCheck::check(
 +    const ast_matchers::MatchFinder::MatchResult &Result) {
 +  if (const auto *ND = Result.Nodes.getNodeAs<NamedDecl>("nameddecl")) {
 +    IdentifierInfo *II = ND->getIdentifier();
 +    if (II && hasRTLCharacters(II->getName()))
 +      diag(ND->getBeginLoc(), "identifier has right-to-left codepoints");
 +  }
 +}
 +
 +void MisleadingIdentifierCheck::registerMatchers(
 +    ast_matchers::MatchFinder *Finder) {
 +  Finder->addMatcher(ast_matchers::namedDecl().bind("nameddecl"), this);
 +}
 +
 +} // namespace misc
 +} // namespace tidy
 +} // namespace clang
 diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h
 new file mode 100644
 index 0000000..9580ae6
 --- /dev/null
 +++ b/clang-tools-extra/clang-tidy/misc/MisleadingIdentifier.h
@@ -0,0 +1,31 @@
 +//===--- MisleadingIdentifierCheck.h - clang-tidy ---------------*- C++ -*-===//
 +//
 +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 +// See https://llvm.org/LICENSE.txt for license information.
 +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 +//
 +//===----------------------------------------------------------------------===//
 +
 +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGIDENTIFIERCHECK_H
 +#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGIDENTIFIERCHECK_H
 +
 +#include "../ClangTidyCheck.h"
 +
 +namespace clang {
 +namespace tidy {
 +namespace misc {
 +
 +class MisleadingIdentifierCheck : public ClangTidyCheck {
 +public:
 +  MisleadingIdentifierCheck(StringRef Name, ClangTidyContext *Context);
 +  ~MisleadingIdentifierCheck();
 +
 +  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
 +  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
 +};
 +
 +} // namespace misc
 +} // namespace tidy
 +} // namespace clang
 +
 +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_MISLEADINGIDENTIFIERCHECK_H
 diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst
 index 546d544..3f0ab3b 100644
 --- a/clang-tools-extra/docs/ReleaseNotes.rst
 +++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -308,6 +308,11 @@ New checks
 - New :doc:`bugprone-signal-handler
   <clang-tidy/checks/bugprone-signal-handler>` check.
 +- New :doc:`readability-data-pointer <clang-tidy/checks/readability-data-pointer>` check.
 +
 +- New :doc:`concurrency-thread-canceltype-asynchronous
 +  <clang-tidy/checks/concurrency-thread-canceltype-asynchronous>` check.
 +
   Finds functions registered as signal handlers that call non asynchronous-safe
   functions.
@@ -331,6 +336,10 @@ New checks
   Inspect string literal and comments for unterminated bidirectional Unicode
   characters.
 +- New :doc:`misc-misleading-identifier <clang-tidy/checks/misc-misleading-identifier>` check.
 +
 +  Reports identifier with unicode right-to-left characters.
 +
 New check aliases
 ^^^^^^^^^^^^^^^^^
 diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst
 index 977867d..9c0a5b0 100644
 --- a/clang-tools-extra/docs/clang-tidy/checks/list.rst
 +++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst
@@ -204,6 +204,7 @@ Clang-Tidy Checks
    `misc-definitions-in-headers <misc-definitions-in-headers.html>`_, "Yes"
    `misc-homoglyph <misc-homoglyph.html>`_,
    `misc-misleading-bidirectional <misc-misleading-bidirectional.html>`_,
 +   `misc-misleading-identifier <misc-mileading-identifier.html>`_,
    `misc-misplaced-const <misc-misplaced-const.html>`_,
    `misc-new-delete-overloads <misc-new-delete-overloads.html>`_,
    `misc-no-recursion <misc-no-recursion.html>`_,
 diff --git a/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-identifier.rst b/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-identifier.rst
 new file mode 100644
 index 0000000..7ccbc94
 --- /dev/null
 +++ b/clang-tools-extra/docs/clang-tidy/checks/misc-misleading-identifier.rst
@@ -0,0 +1,23 @@
 +.. title:: clang-tidy - misc-misleading-identifier
 +
 +misc-misleading-identifier
 +==========================
 +
 +Finds identifiers that contain Unicode characters with right-to-left direction,
 +which can be confusing as they may change the understanding of a whole statement
 +line, as described in `Trojan Source <https://trojansource.codes>`_.
 +
 +An example of such misleading code follows:
 +
 +.. code-block:: c
 +
 +  #include <stdio.h>
 +
 +  short int א = (short int)0;
 +  short int ג = (short int)12345;
 +
 +  int main() {
 +    int א = ג; // a local variable, set to zero?
 +    printf("ג is %d\n", ג);
 +    printf("א is %d\n", א);
 +  }
 diff --git a/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp b/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp
 new file mode 100644
 index 0000000..cb036f9
 --- /dev/null
 +++ b/clang-tools-extra/test/clang-tidy/checkers/misc-misleading-identifier.cpp
@@ -0,0 +1,15 @@
 +// RUN: %check_clang_tidy %s misc-misleading-identifier %t
 +
 +#include <stdio.h>
 +
 +// CHECK-MESSAGES: :[[#@LINE+1]]:1: warning: identifier has right-to-left codepoints [misc-misleading-identifier]
 +short int א = (short int)0;
 +// CHECK-MESSAGES: :[[#@LINE+1]]:1: warning: identifier has right-to-left codepoints [misc-misleading-identifier]
 +short int ג = (short int)12345;
 +
 +int main() {
 +  // CHECK-MESSAGES: :[[#@LINE+1]]:3: warning: identifier has right-to-left codepoints [misc-misleading-identifier]
 +  int א = ג; // a local variable, set to zero?
 +  printf("ג is %d\n", ג);
 +  printf("א is %d\n", א);
 +}
 -- 
 1.8.3.1
--- a/SPECS/clang.spec
+++ b/SPECS/clang.spec
@ -68,7 +68,7 @@
 Name:		%pkg_name
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}
-Release:	2%{?dist}
+Release:	4%{?dist}
 Summary:	A C language family front-end for LLVM
 License:	NCSA
@ -95,6 +95,13 @@ Patch201    clangd-tests.patch
 %endif
 %endif
 Patch202:   0001-Confusable-identifiers-detection.patch
 Patch203:   0002-Misleading-bidirectional-detection.patch
 Patch204:   0003-Misleading-unicode-identifier-detection-pass.patch
 # Not Upstream
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
@ -541,6 +548,12 @@ false
 %endif
 %changelog
 * Wed Nov 10 2021 sguelton@redhat.com - 12.0.1-4
 - Trojan source clang-tidy patchset fix
 * Thu Nov 4 2021 sguelton@redhat.com - 12.0.1-3
 - Trojan source clang-tidy patchset
 * Fri Sep 17 2021 Tom Stellard <tstellar@redhat.com> - 12.0.1-2
 - Only enable -funwind-tables by default on some arches