Author: zoecarver Date: 2020-02-25T12:47:14-08:00 New Revision: 6201f6601dec03e44424ad2d5cc04a9766f194b1
URL: https://github.com/llvm/llvm-project/commit/6201f6601dec03e44424ad2d5cc04a9766f194b1 DIFF: https://github.com/llvm/llvm-project/commit/6201f6601dec03e44424ad2d5cc04a9766f194b1.diff LOG: Check args passed to __builtin_frame_address and __builtin_return_address. Verifies that an argument passed to __builtin_frame_address or __builtin_return_address is within the range [0, 0xFFFF] Differential revision: https://reviews.llvm.org/D66839 Re-committed after fixed: c93112dc4f745b0455addb54bfe1c2f79b827c6d Added: Modified: clang/lib/Sema/SemaChecking.cpp clang/test/Sema/builtin-stackaddress.c Removed: ################################################################################ diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index a986ef2bb685..7aa115fb03c1 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -1847,6 +1847,11 @@ Sema::CheckBuiltinFunctionCall(FunctionDecl *FDecl, unsigned BuiltinID, if (SemaBuiltinOSLogFormat(TheCall)) return ExprError(); break; + case Builtin::BI__builtin_frame_address: + case Builtin::BI__builtin_return_address: + if (SemaBuiltinConstantArgRange(TheCall, 0, 0, 0xFFFF)) + return ExprError(); + break; } // Since the target specific builtins for each arch overlap, only check those diff --git a/clang/test/Sema/builtin-stackaddress.c b/clang/test/Sema/builtin-stackaddress.c index 5f63bb114624..ecdc64d899af 100644 --- a/clang/test/Sema/builtin-stackaddress.c +++ b/clang/test/Sema/builtin-stackaddress.c @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s + void* a(unsigned x) { return __builtin_return_address(0); } @@ -8,9 +9,30 @@ return __builtin_return_address(x); // expected-error{{argument to '__builtin_re } void* c(unsigned x) { +// expected-error@+1 {{argument value 4294967295 is outside the valid range [0, 65535]}} +return __builtin_return_address(-1); +} + +void* d(unsigned x) { +// expected-error@+1 {{argument value 1048575 is outside the valid range [0, 65535]}} +return __builtin_return_address(0xFFFFF); +} + +void* e(unsigned x) { return __builtin_frame_address(0); } -void d(unsigned x) { -return __builtin_frame_address(x); // expected-error{{argument to '__builtin_frame_address' must be a constant integer}} +void f(unsigned x) { +// expected-error@+1 {{argument to '__builtin_frame_address' must be a constant integer}} +return __builtin_frame_address(x); +} + +void* g(unsigned x) { +// expected-error@+1 {{argument value 4294967295 is outside the valid range [0, 65535]}} +return __builtin_frame_address(-1); +} + +void* h(unsigned x) { +// expected-error@+1 {{argument value 1048575 is outside the valid range [0, 65535]}} +return __builtin_frame_address(0xFFFFF); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
