Make _FORTIFY_SOURCE defines dependent on the feature
Ian Rogers
reviewerPATCH 1/2 Make _FORTIFY_SOURCE defines dependent on the feature
Unconditionally defining _FORTIFY_SOURCE can break tools that don't work with it, such as memory sanitizers:
https://github.com/google/sanitizers/wiki/AddressSanitizer#faq
--- tools/lib/subcmd/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/lib/subcmd/Makefile +7 -1
@@ -20,7 +20,13 @@ MAKEFLAGS += --no-print-directory LIBFILE = $(OUTPUT)libsubcmd.a CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC +CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -fPIC + +ifeq ($(DEBUG),0) + ifeq ($(feature-fortify-source), 1) + CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + endif +endif ifeq ($(CC_NO_CLANG), 0) CFLAGS += -O3
Signature · 1 line
2.23.0.351.gc4317032e6-goog
Ian Rogers
reviewerPATCH 2/2 Avoid raising segv using an obvious null dereference
An optimized build such as:
make -C tools/perf CLANG=1 CC=clang EXTRA_CFLAGS="-O3
will turn the dereference operation into a ud2 instruction, raising a SIGILL rather than a SIGSEGV. Use raise(..) for correctness and clarity.
Similar issues were addressed in Numfor Mbiziwo-Tiapo's patch:
https://lkml.org/lkml/2019/7/8/1234
--- tools/perf/tests/perf-hooks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/perf/tests/perf-hooks.c +1 -2
@@ -19,12 +19,11 @@ static void sigsegv_handler(int sig __maybe_unused)static void the_hook (void *_hook_flags) {int *hook_flags = _hook_flags; -int *p =NULL ; *hook_flags =1234 ;/* Generate a segfault, test perf_hooks__recover */ - *p =0 ; +raise (SIGSEGV ); }int test__perf_hooks (struct test *test__maybe_unused ,int subtest__maybe_unused )
Signature · 1 line
2.23.0.351.gc4317032e6-goog
Arnaldo Carvalho de Melo
AppliedRe: [PATCH 2/2] Avoid raising segv using an obvious null dereference
Em Wed, Sep 25, 2019 at 12:59:24PM -0700, Ian Rogers escreveu:
Quoted 7 lines
An optimized build such as:
make -Ctools/perfCLANG=1 CC=clang EXTRA_CFLAGS="-O3
will turn the dereference operation into a ud2 instruction, raising a SIGILL rather than a SIGSEGV. Use raise(..) for correctness and clarity.Similar issues were addressed in Numfor Mbiziwo-Tiapo's patch:
https://lkml.org/lkml/2019/7/8/1234
Added:
And:
And:
Committer testing:
Before:
[root@quaco ~]# perf test hooks
55: perf hooks : Ok
[root@quaco ~]# perf test -v hooks
55: perf hooks :
--- start ---
test child forked, pid 17092
SIGSEGV is observed as expected, try to recover. Fatal error (SEGFAULT) in perf hook 'test' test child finished with 0
---- end ----
perf hooks: Ok
[root@quaco ~]#
After:
[root@quaco ~]# perf test hooks
55: perf hooks : Ok
[root@quaco ~]# perf test -v hooks
55: perf hooks :
--- start ---
test child forked, pid 17909
SIGSEGV is observed as expected, try to recover. Fatal error (SEGFAULT) in perf hook 'test' test child finished with 0
---- end ----
perf hooks: Ok
[root@quaco ~]#
----------------------------------------------------------------------------
Thanks, applied.
- Arnaldo
Quoted 25 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/tests/perf-hooks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)tools/perf/tests/perf-hooks.c +1
-2@@ -19,12 +19,11 @@ static void sigsegv_handler(int sig __maybe_unused)static void the_hook (void *_hook_flags) {int *hook_flags = _hook_flags; -int *p =NULL ; *hook_flags =1234 ;/* Generate a segfault, test perf_hooks__recover */ - *p =0 ; +raise (SIGSEGV ); }int test__perf_hooks (struct test *test__maybe_unused ,int subtest__maybe_unused )Signature · 1 line
2.23.0.351.gc4317032e6-goog
Signature · 1 line
- Arnaldo
[tip: perf/urgent] perf tests: Avoid raising SEGV using an obvious NULL dereference
In reply to Ian RogersThe following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: e3e2cf3d5b1fe800b032e14c0fdcd9a6fb20cf3b Gitweb: https://git.kernel.org/tip/e3e2cf3d5b1fe800b032e14c0fdcd9a6fb20cf3b Author: Ian Rogers <[email protected]> AuthorDate: Wed, 25 Sep 2019 12:59:24 -07:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 27 Sep 2019 09:26:14 -03:00
perf tests: Avoid raising SEGV using an obvious NULL dereference
An optimized build such as:
make -C tools/perf CLANG=1 CC=clang EXTRA_CFLAGS="-O3
will turn the dereference operation into a ud2 instruction, raising a SIGILL rather than a SIGSEGV. Use raise(..) for correctness and clarity.
Similar issues were addressed in Numfor Mbiziwo-Tiapo's patch:
https://lkml.org/lkml/2019/7/8/1234
Committer testing:
Before:
[root@quaco ~]# perf test hooks
55: perf hooks : Ok
[root@quaco ~]# perf test -v hooks
55: perf hooks :
--- start ---
test child forked, pid 17092
SIGSEGV is observed as expected, try to recover. Fatal error (SEGFAULT) in perf hook 'test' test child finished with 0
---- end ----
perf hooks: Ok
[root@quaco ~]#
After:
[root@quaco ~]# perf test hooks
55: perf hooks : Ok
[root@quaco ~]# perf test -v hooks
55: perf hooks :
--- start ---
test child forked, pid 17909
SIGSEGV is observed as expected, try to recover. Fatal error (SEGFAULT) in perf hook 'test' test child finished with 0
---- end ----
perf hooks: Ok
[root@quaco ~]#
--- tools/perf/tests/perf-hooks.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
tools/perf/tests/perf-hooks.c +1 -2
@@ -19,12 +19,11 @@ static void sigsegv_handler(int sig __maybe_unused)static void the_hook (void *_hook_flags) {int *hook_flags = _hook_flags; -int *p =NULL ; *hook_flags =1234 ;/* Generate a segfault, test perf_hooks__recover */ - *p =0 ; +raise (SIGSEGV ); }int test__perf_hooks (struct test *test__maybe_unused ,int subtest__maybe_unused )
Em Wed, Sep 25, 2019 at 12:59:23PM -0700, Ian Rogers escreveu:
Quoted 3 lines
Unconditionally defining
_FORTIFY_SOURCEcan break tools that don't work with it, such as memory sanitizers:
https://github.com/google/sanitizers/wiki/AddressSanitizer#faq
Thanks, and added this:
Quoted 26 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/lib/subcmd/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)tools/lib/subcmd/Makefile +7
-1@@ -20,7 +20,13 @@ MAKEFLAGS += --no-print-directory LIBFILE = $(OUTPUT)libsubcmd.a CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC +CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -fPIC + +ifeq ($(DEBUG),0) + ifeq ($(feature-fortify-source), 1) + CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + endif +endif ifeq ($(CC_NO_CLANG), 0) CFLAGS += -O3Signature · 1 line
2.23.0.351.gc4317032e6-goog
Signature · 1 line
- Arnaldo
[tip: perf/urgent] libsubcmd: Make _FORTIFY_SOURCE defines dependent on the feature
In reply to Ian RogersThe following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 4b0b2b096da9d296e0e5668cdfba8613bd6f5bc8 Gitweb: https://git.kernel.org/tip/4b0b2b096da9d296e0e5668cdfba8613bd6f5bc8 Author: Ian Rogers <[email protected]> AuthorDate: Wed, 25 Sep 2019 12:59:23 -07:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 27 Sep 2019 09:26:14 -03:00
libsubcmd: Make _FORTIFY_SOURCE defines dependent on the feature
Unconditionally defining _FORTIFY_SOURCE can break tools that don't work with it, such as memory sanitizers:
https://github.com/google/sanitizers/wiki/AddressSanitizer#faq
--- tools/lib/subcmd/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/lib/subcmd/Makefile +7 -1
@@ -20,7 +20,13 @@ MAKEFLAGS += --no-print-directory LIBFILE = $(OUTPUT)libsubcmd.a CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC +CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -fPIC + +ifeq ($(DEBUG),0) + ifeq ($(feature-fortify-source), 1) + CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + endif +endif ifeq ($(CC_NO_CLANG), 0) CFLAGS += -O3