Skip to contentSkip to conversation

kernel-shark: Be more careful with kshark-su-record

PATCH In review Steven Rostedt 2 participants 8 messages Jul 23, 2019 – Jul 25, 2019

lore
Share & tools
lore
#0 lore raw

cover kernel-shark: Be more careful with kshark-su-record

Two issues with kshark-su-record.

1) It just calls kshark-record with no path, which can be an issue if pkexec removes PATH variable, or sets it to something that kshark-record is not in.

2) Need to set DISPLAY variable, because on some of my machines, the kshark-record failed to execute due to pkexec removing the DISPLAY variable.

Steven Rostedt (VMware) (2):
kernel-shark: Execute kshark-record from same dir as kshark-su-record
kernel-shark: Set the DISPLAY environment for pkexec kshark-record

----

 kernel-shark/bin/kshark-su-record | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
#1 lore raw

PATCH 1/2 kernel-shark: Execute kshark-record from same dir as kshark-su-record

From: "Steven Rostedt (VMware)" <[email protected]>

Do not trust the PATH environment variable (and in fact that may not even be available with the pkexec). Instead, use the same path as kshark-su-record to find kshark-record. They should always be together anyway.

---
 kernel-shark/bin/kshark-su-record | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel-shark/bin/kshark-su-record +2 -1
index 2477045f1710..7faff1cb3339 100755
@@ -5,4 +5,5 @@ then
     xhost +si:localuser:root &>/dev/null
 fi
 
-pkexec kshark-record -o ${PWD}/trace.dat
+THIS_DIR=`dirname $0`
+pkexec ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat
Signature · 1 line
2.20.1
#2 lore raw

Re: [PATCH 1/2] kernel-shark: Execute kshark-record from same dir as kshark-su-record

Quoted 17 lines · Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

Do not trust the PATH environment variable (and in fact that may not even be available with the pkexec). Instead, use the same path as kshark-su-record to find kshark-record. They should always be together anyway.

---
  kernel-shark/bin/kshark-su-record | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
kernel-shark/bin/kshark-su-record +0 -0
index 2477045f1710..7faff1cb3339 100755

kernel-shark/bin/kshark-su-record then · line 9

Quoted 6 lines
kernel-shark/bin/kshark-su-record +2 -1
@@ -5,4 +5,5 @@ then
      xhost +si:localuser:root &>/dev/null
  fi
 
-pkexec kshark-record -o ${PWD}/trace.dat
+THIS_DIR=`dirname $0`
+pkexec ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat

I just realized that there is one problem with the patch. With this modification, you can use only the installed version of the script (so you more or less depend on PATH).

This will work:
kshark-su-record

This will work as well:
/usr/local/bin/kshark-su-record

However this will not work:
kernel-shark/bin/kshark-su-record

because you are trying to start with pkexec an executable from your $HOME

Thanks!
Yordan

#3 lore raw

Re: [PATCH 1/2] kernel-shark: Execute kshark-record from same dir as kshark-su-record

Quoted 7 lines · On Thu, 25 Jul 2019 12:01:34 +0300 "Yordan Karadzhov (VMware)"…

I just realized that there is one problem with the patch. With this modification, you can use only the installed version of the script (so you more or less depend on PATH).

This will work:
kshark-su-record

Quoted 7 lines

This will work as well:
/usr/local/bin/kshark-su-record

However this will not work:
kernel-shark/bin/kshark-su-record

because you are trying to start with pkexec an executable from your $HOME

What about this patch?

-- Steve

kernel-shark/bin/kshark-su-record +4 -0
index 8c9fbd02a351..152d0cdff3e7 100755
@@ -6,4 +6,8 @@ then
 fi
 
 THIS_DIR=`dirname $0`
+if [ "${THIS_DIR#/}" == "${THIS_DIR}" ]
+then
+    THIS_DIR=`pwd`"/$THIS_DIR"
+fi
 pkexec env DISPLAY=${DISPLAY} ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat
#4 lore raw

Re: [PATCH 1/2] kernel-shark: Execute kshark-record from same dir as kshark-su-record

Quoted 29 lines · Steven Rostedt
Quoted 7 lines · On Thu, 25 Jul 2019 12:01:34 +0300 "Yordan Karadzhov (VMware)"…

I just realized that there is one problem with the patch. With this modification, you can use only the installed version of the script (so you more or less depend on PATH).

This will work:
kshark-su-record

Quoted 7 lines

This will work as well:
/usr/local/bin/kshark-su-record

However this will not work:
kernel-shark/bin/kshark-su-record

because you are trying to start with pkexec an executable from your $HOME

What about this patch?

-- Steve

kernel-shark/bin/kshark-su-record +0 -0
index 8c9fbd02a351..152d0cdff3e7 100755

kernel-shark/bin/kshark-su-record then · line 13

Quoted 8 lines
kernel-shark/bin/kshark-su-record +4 -0
@@ -6,4 +6,8 @@ then
  fi
 
  THIS_DIR=`dirname $0`
+if [ "${THIS_DIR#/}" == "${THIS_DIR}" ]
+then
+    THIS_DIR=`pwd`"/$THIS_DIR"
+fi
  pkexec env DISPLAY=${DISPLAY} ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat

I see that this works, however now I am really confused why it works.

I thought that pkexec will start an executable only from the path provided in

kernel-shark/org.freedesktop.kshark-record.policy

Thanks!
Yordan

#5 lore raw

Re: [PATCH 1/2] kernel-shark: Execute kshark-record from same dir as kshark-su-record

In reply to Steven Rostedt
Quoted 29 lines · Steven Rostedt
Quoted 7 lines · On Thu, 25 Jul 2019 12:01:34 +0300 "Yordan Karadzhov (VMware)"…

I just realized that there is one problem with the patch. With this modification, you can use only the installed version of the script (so you more or less depend on PATH).

This will work:
kshark-su-record

Quoted 7 lines

This will work as well:
/usr/local/bin/kshark-su-record

However this will not work:
kernel-shark/bin/kshark-su-record

because you are trying to start with pkexec an executable from your $HOME

What about this patch?

-- Steve

kernel-shark/bin/kshark-su-record +0 -0
index 8c9fbd02a351..152d0cdff3e7 100755

kernel-shark/bin/kshark-su-record then · line 13

Quoted 8 lines
kernel-shark/bin/kshark-su-record +4 -0
@@ -6,4 +6,8 @@ then
  fi
 
  THIS_DIR=`dirname $0`
+if [ "${THIS_DIR#/}" == "${THIS_DIR}" ]
+then
+    THIS_DIR=`pwd`"/$THIS_DIR"
+fi
  pkexec env DISPLAY=${DISPLAY} ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat

I see that this works, however now I am really confused why it works.

I thought that pkexec will start an executable only from the path provided in

kernel-shark/org.freedesktop.kshark-record.policy

Thanks!
Yordan

#6 lore raw

PATCH 2/2 kernel-shark: Set the DISPLAY environment for pkexec kshark-record

In reply to Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

When running a fresh install, I hit this:

ERROR: Capture process failed:
Unknown errorqt.qpa.screen: QXcbConnection: Could not connect to display Could not connect to any X display.

This was due to pkexec not saving the DISPLAY environment variable. To solve this, pass that variable as one of the environment variables to pkexec.

---
 kernel-shark/bin/kshark-su-record | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel-shark/bin/kshark-su-record +1 -1
index 7faff1cb3339..8c9fbd02a351 100755
@@ -6,4 +6,4 @@ then
 fi
 
 THIS_DIR=`dirname $0`
-pkexec ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat
+pkexec env DISPLAY=${DISPLAY} ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat
Signature · 1 line
2.20.1
Reviewed-by on v1 2/2
#7 lore raw

Re: [PATCH 2/2] kernel-shark: Set the DISPLAY environment for pkexec kshark-record

Quoted 22 lines · Steven Rostedt

From: "Steven Rostedt (VMware)" <[email protected]>

When running a fresh install, I hit this:

ERROR: Capture process failed:
Unknown errorqt.qpa.screen: QXcbConnection: Could not connect to display Could not connect to any X display.

This was due to pkexec not saving the DISPLAY environment variable. To solve this, pass that variable as one of the environment variables to pkexec.

---
  kernel-shark/bin/kshark-su-record | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
kernel-shark/bin/kshark-su-record +0 -0
index 7faff1cb3339..8c9fbd02a351 100755

kernel-shark/bin/kshark-su-record then · line 9

Quoted 5 lines
kernel-shark/bin/kshark-su-record +1 -1
@@ -6,4 +6,4 @@ then
  fi
 
  THIS_DIR=`dirname $0`
-pkexec ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat
+pkexec env DISPLAY=${DISPLAY} ${THIS_DIR}/kshark-record -o ${PWD}/trace.dat

Both patches look good to me.
Thanks!
Yordan