From 00d9997cdd06bcdf202de93445807445808ea503 Mon Sep 17 00:00:00 2001 From: John Johansen Date: Sun, 24 Dec 2017 00:22:24 -0800 Subject: [PATCH] aa-decode: add the ability to support PROCTITLE string buglink: https://bugs.launchpad.net/apparmor/+bug/1736841 Signed-off-by: John Johansen (cherry picked from commit 3afbfed9eef56d029a9a5890e5c463165530d509) --- utils/aa-decode | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/aa-decode b/utils/aa-decode index 41dfa3241..14cc151b7 100755 --- a/utils/aa-decode +++ b/utils/aa-decode @@ -70,7 +70,7 @@ fi while read line ; do # check if line contains encoded name= or profile= - if [[ "$line" =~ \ (name|profile)=[0-9a-fA-F] ]]; then + if [[ "$line" =~ \ (name|profile|proctitle)=[0-9a-fA-F] ]]; then # cut the encoded filename/profile name out of the line and decode it ne=`echo "$line" | sed 's/.* name=\([^ ]*\).*$/\\1/g'` @@ -79,9 +79,13 @@ while read line ; do pe=`echo "$line" | sed 's/.* profile=\([^ ]*\).*$/\\1/g'` pd="$(decode ${pe/\'/\\\'})" + pce=`echo "$line" | sed 's/.* proctitle=\([^ ]*\).*$/\\1/g'` + pcd="$(decode ${pce/\'/\\\'})" + # replace encoded name and profile with its decoded counterparts (only if it was encoded) test -n "$nd" && line="${line/name=$ne/name=\"$nd\"}" test -n "$pd" && line="${line/profile=$pe/profile=\"$pd\"}" + test -n "$pcd" && line="${line/proctitle=$pce/proctitle=\"$pcd\"}" fi