2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 14:25:52 +00:00

Merge from trunk rev 1733: Bug:

https://bugs.launchpad.net/apparmor/+bug/788616

This patch fixes the init scripts helper functions file to
filter out the hat/child process separator as currently used
by the parser, '//' rather than what used to be used, the '^'
symbol. This fixes bugs where profiles that covered regexs (e.g.
'/usr/lib/firefox-4.0.1/firefox{,*[^s][^h]}') and thus were being
improperly filtered away and unloaded when reloading apparmor policy.

Nominated-By: Steve Beattie <sbeattie@ubuntu.com>
Acked-By: Kees Cook <kees@ubuntu.com>
This commit is contained in:
Steve Beattie
2011-06-02 20:05:53 -07:00
parent ab63cb9142
commit 106fa146fe

View File

@@ -235,7 +235,7 @@ profiles_names_list() {
for profile in $PROFILE_DIR/*; do
if skip_profile "${profile}" && [ -f "${profile}" ] ; then
LIST_ADD=$($PARSER $ABSTRACTIONS -N "$profile" | grep -v '\^')
LIST_ADD=$($PARSER $ABSTRACTIONS -N "$profile" | grep -v '//')
if [ $? -eq 0 ]; then
echo "$LIST_ADD" >>$TMPFILE
fi