From 7036413dc21254c8bf2f4ac62a3b087bc4b94ce8 Mon Sep 17 00:00:00 2001 From: Balazs Benics Date: Wed, 23 Feb 2022 12:55:31 +0100 Subject: [PATCH] Revert "Revert "[analyzer] Fix taint rule of fgets and setproctitle_init"" This reverts commit 2acead35c1289d2b3593a992b0639ca6427e481f. Let's try `REQUIRES: asserts`. --- .../StaticAnalyzer/Checkers/GenericTaintChecker.cpp | 4 ++-- .../taint-checker-callback-order-has-definition.c | 4 +--- .../taint-checker-callback-order-without-definition.c | 5 ----- clang/test/Analysis/taint-generic.c | 19 +++++++++++++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp index 66143f7..d15a465 100644 --- a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -559,7 +559,7 @@ void GenericTaintChecker::initTaintRules(CheckerContext &C) const { {{"atoll"}, TR::Prop({{0}}, {{ReturnValueIndex}})}, {{"fgetc"}, TR::Prop({{0}}, {{ReturnValueIndex}})}, {{"fgetln"}, TR::Prop({{0}}, {{ReturnValueIndex}})}, - {{"fgets"}, TR::Prop({{2}}, {{0}, ReturnValueIndex})}, + {{"fgets"}, TR::Prop({{2}}, {{0, ReturnValueIndex}})}, {{"fscanf"}, TR::Prop({{0}}, {{}, 2})}, {{"sscanf"}, TR::Prop({{0}}, {{}, 2})}, {{"getc"}, TR::Prop({{0}}, {{ReturnValueIndex}})}, @@ -632,7 +632,7 @@ void GenericTaintChecker::initTaintRules(CheckerContext &C) const { if (TR::UntrustedEnv(C)) { // void setproctitle_init(int argc, char *argv[], char *envp[]) GlobalCRules.push_back( - {{{"setproctitle_init"}}, TR::Sink({{2}}, MsgCustomSink)}); + {{{"setproctitle_init"}}, TR::Sink({{1, 2}}, MsgCustomSink)}); GlobalCRules.push_back({{"getenv"}, TR::Source({{ReturnValueIndex}})}); } diff --git a/clang/test/Analysis/taint-checker-callback-order-has-definition.c b/clang/test/Analysis/taint-checker-callback-order-has-definition.c index f718fa5..eaf96cc 100644 --- a/clang/test/Analysis/taint-checker-callback-order-has-definition.c +++ b/clang/test/Analysis/taint-checker-callback-order-has-definition.c @@ -27,11 +27,9 @@ void top(const char *fname, char *buf) { (void)fgets(buf, 42, fp); // Trigger taint propagation. // CHECK-NEXT: PreCall prepares tainting arg index: -1 // CHECK-NEXT: PreCall prepares tainting arg index: 0 - // CHECK-NEXT: PreCall prepares tainting arg index: 1 // CHECK-NEXT: PreCall prepares tainting arg index: 2 - + // // CHECK-NEXT: PostCall actually wants to taint arg index: -1 // CHECK-NEXT: PostCall actually wants to taint arg index: 0 - // CHECK-NEXT: PostCall actually wants to taint arg index: 1 // CHECK-NEXT: PostCall actually wants to taint arg index: 2 } diff --git a/clang/test/Analysis/taint-checker-callback-order-without-definition.c b/clang/test/Analysis/taint-checker-callback-order-without-definition.c index dba23f3..6de87f7 100644 --- a/clang/test/Analysis/taint-checker-callback-order-without-definition.c +++ b/clang/test/Analysis/taint-checker-callback-order-without-definition.c @@ -21,16 +21,11 @@ void top(const char *fname, char *buf) { (void)fgets(buf, 42, fp); // Trigger taint propagation. - // FIXME: Why is the arg index 1 prepared for taint? - // Before the call it wasn't tainted, and it also shouldn't be tainted after the call. - // CHECK-NEXT: PreCall prepares tainting arg index: -1 // CHECK-NEXT: PreCall prepares tainting arg index: 0 - // CHECK-NEXT: PreCall prepares tainting arg index: 1 // CHECK-NEXT: PreCall prepares tainting arg index: 2 // // CHECK-NEXT: PostCall actually wants to taint arg index: -1 // CHECK-NEXT: PostCall actually wants to taint arg index: 0 - // CHECK-NEXT: PostCall actually wants to taint arg index: 1 // CHECK-NEXT: PostCall actually wants to taint arg index: 2 } diff --git a/clang/test/Analysis/taint-generic.c b/clang/test/Analysis/taint-generic.c index 6979c06..0612e1b 100644 --- a/clang/test/Analysis/taint-generic.c +++ b/clang/test/Analysis/taint-generic.c @@ -58,9 +58,11 @@ extern FILE *stdin; #define bool _Bool +char *getenv(const char *name); int fscanf(FILE *restrict stream, const char *restrict format, ...); int sprintf(char *str, const char *format, ...); void setproctitle(const char *fmt, ...); +void setproctitle_init(int argc, char *argv[], char *envp[]); typedef __typeof(sizeof(int)) size_t; // Define string functions. Use builtin for some of them. They all default to @@ -404,3 +406,20 @@ void testConfigurationSinks(void) { void testUnknownFunction(void (*foo)(void)) { foo(); // no-crash } + +void testProctitleFalseNegative() { + char flag[80]; + fscanf(stdin, "%79s", flag); + char *argv[] = {"myapp", flag}; + // FIXME: We should have a warning below: Untrusted data passed to sink. + setproctitle_init(1, argv, 0); +} + +void testProctitle2(char *real_argv[]) { + char *app = getenv("APP_NAME"); + if (!app) + return; + char *argv[] = {app, "--foobar"}; + setproctitle_init(1, argv, 0); // expected-warning {{Untrusted data is passed to a user-defined sink}} + setproctitle_init(1, real_argv, argv); // expected-warning {{Untrusted data is passed to a user-defined sink}} +} -- 2.7.4