[apparmor] [patch] load_include(): avoid loading directory includes multiple times

Christian Boltz apparmor at cboltz.de
Sat Oct 3 21:16:50 UTC 2015


Am Sonntag, 13. September 2015 schrieb Christian Boltz:
> the "already loaded?" check in load_include() was done at the
> beginning of the function, before entering the loop and before the
> individual files of directory includes were added to the filelist.
> This resulted in a (wrong) "Conflicting profiles" error for directory
> includes.
> This patch moves the "alreay loaded?" check inside the loop, so that 
> it's executed for all files, including those of directory includes.
> The conflict check is in trunk only, therefore I don't see a need to
> apply this patch to 2.9 (besides saving some CPU cycles).
> BTW: This bug was uncovered by minitools_test.py, which isn't part of
> make check yet. Maybe we should rename it to test-minitools.py to
> enable it?
> [ 88-avoid-duplicate-read-in-load_include.diff ]

Any comments or reviews on this patch?

If nobody objects, I'll commit it on Wednesday as Acked-by <timeout>.


Christian Boltz
Wieviele Leute braucht es, um Windows zu installieren? - Sieben!
Einen, der sich die CD leisten kann, drei die ausdiskutieren, wie man
das wohl macht, zwei Priester, die beten, dass es funktioniert und einen
Psychiater, der die Nervenzusammenbrüche behandelt!!!

More information about the AppArmor mailing list