Skip to contentSkip to conversation

perf tools: Add missing else to cmd_daemon subcommand condition

PATCH Applied Jiri Olsa 3 participants 4 messages Jun 26, 2023 – Jun 27, 2023 perf events

lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH 1/1 perf tools: Add missing else to cmd_daemon subcommand condition

Namhyung reported segfault in perf daemon start command.

It's caused by extra check on argv[0] which is set to NULL by previous __cmd_start call. Adding missing else to skip the extra check.

Fixes 92294b906e6c ("perf daemon: Dynamically allocate path to perf")
---
 tools/perf/builtin-daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-daemon.c +1 -1
index f5674d824a40..83954af36753 100644
@@ -1524,7 +1524,7 @@ int cmd_daemon(int argc, const char **argv)
 	if (argc) {
 		if (!strcmp(argv[0], "start"))
 			ret = __cmd_start(&__daemon, daemon_options, argc, argv);
-		if (!strcmp(argv[0], "signal"))
+		else if (!strcmp(argv[0], "signal"))
 			ret = __cmd_signal(&__daemon, daemon_options, argc, argv);
 		else if (!strcmp(argv[0], "stop"))
 			ret = __cmd_stop(&__daemon, daemon_options, argc, argv);
Signature · 1 line
2.41.0
maintainer Tested-by on v1 1/1
#1 lore raw

Hi Jiri,

Quoted 9 lines · Jiri Olsa

Namhyung reported segfault in perf daemon start command.

It's caused by extra check on argv[0] which is set to NULL by previous __cmd_start call. Adding missing else to skip the extra check.

Fixes 92294b906e6c ("perf daemon: Dynamically allocate path to perf")

Thanks for the fix. Now it runs ok.

Before:

  $ sudo ./perf test -v daemon
   85: daemon operations                                               :
  --- start ---
  test child forked, pid 82420
  test daemon list
  ./tests/shell/daemon.sh: line 133: 82426 Segmentation fault
perf daemon start --config ${config}
  test daemon reconfig
  ./tests/shell/daemon.sh: line 133: 82520 Segmentation fault
perf daemon start --config ${config}
  test daemon stop
  ./tests/shell/daemon.sh: line 133: 82636 Segmentation fault
perf daemon start --config ${config}
  test daemon signal
  ./tests/shell/daemon.sh: line 133: 82674 Segmentation fault
perf daemon start --config ${config}
  signal 12 sent to session 'test [82676]'
  signal 12 sent to session 'test [82676]'
  test daemon ping
  ./tests/shell/daemon.sh: line 133: 82702 Segmentation fault
perf daemon start --config ${config}
  test daemon lock
  ./tests/shell/daemon.sh: line 133: 82734 Segmentation fault
perf daemon start --config ${config}
  test child finished with 0
  ---- end ----
  daemon operations: Ok

Maybe we need to investigate more why it was ok..
But at least I don't see segfaults anymore

After:
85: daemon operations :
--- start ---
test child forked, pid 80752
test daemon list
test daemon reconfig
test daemon stop
test daemon signal
signal 12 sent to session 'test [81022]'
signal 12 sent to session 'test [81022]'
test daemon ping
test daemon lock
test child finished with 0
---- end ----
daemon operations: Ok

Thanks,
Namhyung

Quoted 20 lines
---
 tools/perf/builtin-daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-daemon.c +1 -2
index f5674d824a40..83954af36753 100644
@@ -1524,7 +1524,7 @@ int cmd_daemon(int argc, const char **argv)
        if (argc) {
                if (!strcmp(argv[0], "start"))
                        ret = __cmd_start(&__daemon, daemon_options, argc, argv);
-               if (!strcmp(argv[0], "signal"))
+               else if (!strcmp(argv[0], "signal"))
                        ret = __cmd_signal(&__daemon, daemon_options, argc, argv);
                else if (!strcmp(argv[0], "stop"))
                        ret = __cmd_stop(&__daemon, daemon_options, argc, argv);
--

2.41.0

#2 lore raw
Quoted 44 lines · Namhyung Kim

Hi Jiri,

Quoted 9 lines · Jiri Olsa

Namhyung reported segfault in perf daemon start command.

It's caused by extra check on argv[0] which is set to NULL by previous __cmd_start call. Adding missing else to skip the extra check.

Fixes 92294b906e6c ("perf daemon: Dynamically allocate path to perf")

Thanks for the fix. Now it runs ok.

Before:

  $ sudo ./perf test -v daemon
   85: daemon operations                                               :
  --- start ---
  test child forked, pid 82420
  test daemon list
  ./tests/shell/daemon.sh: line 133: 82426 Segmentation fault
perf daemon start --config ${config}
  test daemon reconfig
  ./tests/shell/daemon.sh: line 133: 82520 Segmentation fault
perf daemon start --config ${config}
  test daemon stop
  ./tests/shell/daemon.sh: line 133: 82636 Segmentation fault
perf daemon start --config ${config}
  test daemon signal
  ./tests/shell/daemon.sh: line 133: 82674 Segmentation fault
perf daemon start --config ${config}
  signal 12 sent to session 'test [82676]'
  signal 12 sent to session 'test [82676]'
  test daemon ping
  ./tests/shell/daemon.sh: line 133: 82702 Segmentation fault
perf daemon start --config ${config}
  test daemon lock
  ./tests/shell/daemon.sh: line 133: 82734 Segmentation fault
perf daemon start --config ${config}
  test child finished with 0
  ---- end ----
  daemon operations: Ok
Quoted 2 lines

Maybe we need to investigate more why it was ok..
But at least I don't see segfaults anymore

yea, for some reason parse_options would put NULL into argv[0]

I'll try to check what changed, in any case the fix makes the condition alligned with the other legs and fixes the segfault

jirka

Quoted 46 lines

After:
85: daemon operations :
--- start ---
test child forked, pid 80752
test daemon list
test daemon reconfig
test daemon stop
test daemon signal
signal 12 sent to session 'test [81022]'
signal 12 sent to session 'test [81022]'
test daemon ping
test daemon lock
test child finished with 0
---- end ----
daemon operations: Ok

Thanks,
Namhyung

Quoted 20 lines
---
 tools/perf/builtin-daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-daemon.c +1 -2
index f5674d824a40..83954af36753 100644
@@ -1524,7 +1524,7 @@ int cmd_daemon(int argc, const char **argv)
        if (argc) {
                if (!strcmp(argv[0], "start"))
                        ret = __cmd_start(&__daemon, daemon_options, argc, argv);
-               if (!strcmp(argv[0], "signal"))
+               else if (!strcmp(argv[0], "signal"))
                        ret = __cmd_signal(&__daemon, daemon_options, argc, argv);
                else if (!strcmp(argv[0], "stop"))
                        ret = __cmd_stop(&__daemon, daemon_options, argc, argv);
--

2.41.0

maintainer Applied
#3 lore raw
Quoted 46 lines · Jiri Olsa
Quoted 44 lines · Namhyung Kim

Hi Jiri,

Quoted 9 lines · Jiri Olsa

Namhyung reported segfault in perf daemon start command.

It's caused by extra check on argv[0] which is set to NULL by previous __cmd_start call. Adding missing else to skip the extra check.

Fixes 92294b906e6c ("perf daemon: Dynamically allocate path to perf")

Thanks for the fix. Now it runs ok.

Before:

  $ sudo ./perf test -v daemon
   85: daemon operations                                               :
  --- start ---
  test child forked, pid 82420
  test daemon list
  ./tests/shell/daemon.sh: line 133: 82426 Segmentation fault
perf daemon start --config ${config}
  test daemon reconfig
  ./tests/shell/daemon.sh: line 133: 82520 Segmentation fault
perf daemon start --config ${config}
  test daemon stop
  ./tests/shell/daemon.sh: line 133: 82636 Segmentation fault
perf daemon start --config ${config}
  test daemon signal
  ./tests/shell/daemon.sh: line 133: 82674 Segmentation fault
perf daemon start --config ${config}
  signal 12 sent to session 'test [82676]'
  signal 12 sent to session 'test [82676]'
  test daemon ping
  ./tests/shell/daemon.sh: line 133: 82702 Segmentation fault
perf daemon start --config ${config}
  test daemon lock
  ./tests/shell/daemon.sh: line 133: 82734 Segmentation fault
perf daemon start --config ${config}
  test child finished with 0
  ---- end ----
  daemon operations: Ok
Quoted 7 lines
Quoted 2 lines

Maybe we need to investigate more why it was ok..
But at least I don't see segfaults anymore

yea, for some reason parse_options would put NULL into argv[0]

I'll try to check what changed, in any case the fix makes the condition alligned with the other legs and fixes the segfault

Yep, thanks for checking.

In the meantime, Thomas Richter reported the same problem and fix. I'll take yours but leave it for the record.

http://lore.kernel.org/r/[email protected]

Applied to perf-tools-next, thanks!