[compiler-rt] r247239 - CFI: Add diagnostic handler and tests for indirect call checker.
Peter Collingbourne via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 10 12:19:53 PDT 2015
Should be fixed by r247324/r247325.
On Thu, Sep 10, 2015 at 09:48:14AM -0700, Steven Wu wrote:
> Hi Peter
>
> This commit breaks darwin bot: http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_check/7056/testReport/junit/cfi/cfi/bad_signature_c/ <http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA_check/7056/testReport/junit/cfi/cfi/bad_signature_c/>
> Can you investigate it?
>
> Thanks
>
> Steven
>
> > On Sep 9, 2015, at 7:18 PM, Peter Collingbourne via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> >
> > Author: pcc
> > Date: Wed Sep 9 21:18:02 2015
> > New Revision: 247239
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=247239&view=rev
> > Log:
> > CFI: Add diagnostic handler and tests for indirect call checker.
> >
> > Differential Revision: http://reviews.llvm.org/D11858
> >
> > Added:
> > compiler-rt/trunk/test/cfi/bad-signature.c
> > compiler-rt/trunk/test/cfi/external-call.c
> > Modified:
> > compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc
> > compiler-rt/trunk/lib/ubsan/ubsan_handlers.h
> > compiler-rt/trunk/test/cfi/lit.cfg
> >
> > Modified: compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc
> > URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc?rev=247239&r1=247238&r2=247239&view=diff
> > ==============================================================================
> > --- compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc (original)
> > +++ compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc Wed Sep 9 21:18:02 2015
> > @@ -473,4 +473,36 @@ void __ubsan::__ubsan_handle_nonnull_arg
> > Die();
> > }
> >
> > +static void handleCFIBadIcall(CFIBadIcallData *Data, ValueHandle Function,
> > + ReportOptions Opts) {
> > + SourceLocation Loc = Data->Loc.acquire();
> > + if (ignoreReport(Loc, Opts))
> > + return;
> > +
> > + ScopedReport R(Opts, Loc);
> > +
> > + Diag(Loc, DL_Error, "control flow integrity check for type %0 failed during "
> > + "indirect function call")
> > + << Data->Type;
> > +
> > + SymbolizedStackHolder FLoc(getSymbolizedLocation(Function));
> > + const char *FName = FLoc.get()->info.function;
> > + if (!FName)
> > + FName = "(unknown)";
> > + Diag(FLoc, DL_Note, "%0 defined here") << FName;
> > +}
> > +
> > +void __ubsan::__ubsan_handle_cfi_bad_icall(CFIBadIcallData *Data,
> > + ValueHandle Function) {
> > + GET_REPORT_OPTIONS(false);
> > + handleCFIBadIcall(Data, Function, Opts);
> > +}
> > +
> > +void __ubsan::__ubsan_handle_cfi_bad_icall_abort(CFIBadIcallData *Data,
> > + ValueHandle Function) {
> > + GET_REPORT_OPTIONS(true);
> > + handleCFIBadIcall(Data, Function, Opts);
> > + Die();
> > +}
> > +
> > #endif // CAN_SANITIZE_UB
> >
> > Modified: compiler-rt/trunk/lib/ubsan/ubsan_handlers.h
> > URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_handlers.h?rev=247239&r1=247238&r2=247239&view=diff
> > ==============================================================================
> > --- compiler-rt/trunk/lib/ubsan/ubsan_handlers.h (original)
> > +++ compiler-rt/trunk/lib/ubsan/ubsan_handlers.h Wed Sep 9 21:18:02 2015
> > @@ -148,6 +148,14 @@ struct NonNullArgData {
> > /// \brief Handle passing null pointer to function with nonnull attribute.
> > RECOVERABLE(nonnull_arg, NonNullArgData *Data)
> >
> > +struct CFIBadIcallData {
> > + SourceLocation Loc;
> > + const TypeDescriptor &Type;
> > +};
> > +
> > +/// \brief Handle control flow integrity failure for indirect function calls.
> > +RECOVERABLE(cfi_bad_icall, CFIBadIcallData *Data, ValueHandle Function)
> > +
> > }
> >
> > #endif // UBSAN_HANDLERS_H
> >
> > Added: compiler-rt/trunk/test/cfi/bad-signature.c
> > URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/bad-signature.c?rev=247239&view=auto
> > ==============================================================================
> > --- compiler-rt/trunk/test/cfi/bad-signature.c (added)
> > +++ compiler-rt/trunk/test/cfi/bad-signature.c Wed Sep 9 21:18:02 2015
> > @@ -0,0 +1,27 @@
> > +// RUN: %clangxx -o %t1 %s
> > +// RUN: %t1 2>&1 | FileCheck --check-prefix=NCFI %s
> > +
> > +// RUN: %clangxx_cfi -o %t2 %s
> > +// RUN: %expect_crash %t2 2>&1 | FileCheck --check-prefix=CFI %s
> > +
> > +// RUN: %clangxx_cfi_diag -g -o %t3 %s
> > +// RUN: %t3 2>&1 | FileCheck --check-prefix=CFI-DIAG %s
> > +
> > +#include <stdio.h>
> > +
> > +void f() {
> > +}
> > +
> > +int main() {
> > + // CFI: 1
> > + // NCFI: 1
> > + fprintf(stderr, "1\n");
> > +
> > + // CFI-DIAG: runtime error: control flow integrity check for type 'void (int)' failed during indirect function call
> > + // CFI-DIAG: f() defined here
> > + ((void (*)(int))f)(42); // UB here
> > +
> > + // CFI-NOT: 2
> > + // NCFI: 2
> > + fprintf(stderr, "2\n");
> > +}
> >
> > Added: compiler-rt/trunk/test/cfi/external-call.c
> > URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/external-call.c?rev=247239&view=auto
> > ==============================================================================
> > --- compiler-rt/trunk/test/cfi/external-call.c (added)
> > +++ compiler-rt/trunk/test/cfi/external-call.c Wed Sep 9 21:18:02 2015
> > @@ -0,0 +1,23 @@
> > +// RUN: %clangxx_cfi -o %t1 %s
> > +// RUN: %t1 c 1 2>&1 | FileCheck --check-prefix=CFI %s
> > +// RUN: %t1 s 2 2>&1 | FileCheck --check-prefix=CFI %s
> > +
> > +#include <stdlib.h>
> > +#include <stdio.h>
> > +#include <math.h>
> > +
> > +int main(int argc, char **argv) {
> > + // CFI: 1
> > + fprintf(stderr, "1\n");
> > +
> > + double (*fn)(double);
> > + if (argv[1][0] == 's')
> > + fn = sin;
> > + else
> > + fn = cos;
> > +
> > + fn(atof(argv[2]));
> > +
> > + // CFI: 2
> > + fprintf(stderr, "2\n");
> > +}
> >
> > Modified: compiler-rt/trunk/test/cfi/lit.cfg
> > URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/cfi/lit.cfg?rev=247239&r1=247238&r2=247239&view=diff
> > ==============================================================================
> > --- compiler-rt/trunk/test/cfi/lit.cfg (original)
> > +++ compiler-rt/trunk/test/cfi/lit.cfg Wed Sep 9 21:18:02 2015
> > @@ -2,7 +2,7 @@ import lit.formats
> > import os
> >
> > config.name = 'cfi'
> > -config.suffixes = ['.cpp', '.test']
> > +config.suffixes = ['.c', '.cpp', '.test']
> > config.test_source_root = os.path.dirname(__file__)
> >
> > clangxx = ' '.join([config.clang] + config.cxx_mode_flags)
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
--
Peter
More information about the llvm-commits
mailing list