[apparmor] [PATCH] parser: fix make parser_regex dependency

Steve Beattie steve at nxnw.org
Wed Jun 24 21:44:13 UTC 2015

On Mon, Jun 22, 2015 at 11:00:01AM -0700, John Johansen wrote:
> Currently rules are added to the expression tree in order, and then
> tree simplification and factoring is done. This forces simplification
> to "search" through the tree to find rules with the same permissions
> during right factoring, which dependent on ordering of factoring may
> not be able to group all rules of the same permissions.
> Instead of having tree factoring do the work to regroup rules with the
> same permissions, pregroup them as part of the expr tree construction.
> And only build the full tree when the dfa is constructed.

My testing of this patch did uncover one problem with incremental
builds, a missing make dependency on the libapparmor_re/aare_rules.h

Signed-off-by: Steve Beattie <steve at nxnw.org>
 parser/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: b/parser/Makefile
--- a/parser/Makefile
+++ b/parser/Makefile
@@ -213,7 +213,7 @@ parser_include.o: parser_include.c parse
 parser_merge.o: parser_merge.c parser.h profile.h
 	$(CXX) $(EXTRA_CFLAGS) -c -o $@ $<
-parser_regex.o: parser_regex.c parser.h profile.h libapparmor_re/apparmor_re.h $(APPARMOR_H)
+parser_regex.o: parser_regex.c parser.h profile.h libapparmor_re/apparmor_re.h libapparmor_re/aare_rules.h $(APPARMOR_H)
 	$(CXX) $(EXTRA_CFLAGS) -c -o $@ $<
 parser_symtab.o: parser_symtab.c parser.h

Steve Beattie
<sbeattie at ubuntu.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20150624/66c6a031/attachment-0001.pgp>

More information about the AppArmor mailing list