On Mon, Apr 19, 2021 at 12:20 PM Petr Lautrbach <plautrba@xxxxxxxxxx> wrote: > > James Carter <jwcart2@xxxxxxxxx> writes: > > > On Thu, Apr 8, 2021 at 3:16 PM James Carter <jwcart2@xxxxxxxxx> wrote: > >> > >> All of these patches (except the first) have been sent to the list in the > >> last month. The first patch is a slight modification of an earlier patch > >> sent by Nicolas Iooss. I also corrected a couple of whitespace errors and > >> updated one patch that would not apply cleanly with one of the earlier > >> patches applied. > >> > >> James Carter (11): > >> libsepol/cil: Fix out-of-bound read of file context pattern ending > >> with "\" > >> libsepol/cil: Destroy classperms list when resetting classpermission > >> libsepol/cil: Destroy classperm list when resetting map perms > >> libsepol/cil: cil_reset_classperms_set() should not reset > >> classpermission > >> libsepol/cil: Set class field to NULL when resetting struct > >> cil_classperms > >> libsepol/cil: More strict verification of constraint leaf expressions > >> libsepol/cil: Exit with an error if declaration name is a reserved > >> word > >> libsepol/cil: Allow permission expressions when using map classes > >> libsepol/cil: Refactor helper function for cil_gen_node() > >> libsepol/cil: Create function cil_add_decl_to_symtab() and refactor > >> libsepol/cil: Move check for the shadowing of macro parameters > >> > >> libsepol/cil/src/cil_build_ast.c | 132 ++++++++++++------------------- > >> libsepol/cil/src/cil_build_ast.h | 2 + > >> libsepol/cil/src/cil_copy_ast.c | 26 +++--- > >> libsepol/cil/src/cil_post.c | 11 +++ > >> libsepol/cil/src/cil_reset_ast.c | 11 ++- > >> libsepol/cil/src/cil_verify.c | 78 +++++++++++++++++- > >> libsepol/cil/src/cil_verify.h | 3 +- > >> 7 files changed, 160 insertions(+), 103 deletions(-) > >> > >> -- > >> 2.26.3 > >> > > > > Most of these patches were sent out almost a month ago. I am planning > > on merging them next week. > > Jim > > I didn't check the content of the changes, but I ran a regression test > suite we use in Red Hat on this and "Update checks for invalid rules in > blocks" patchsets and it didn't discover any problem (just a minor > trailing whitespace I reported last week) > > Acked-by: Petr Lautrbach <plautrba@xxxxxxxxxx> > > I believe you can merge it/ > > Thanks! > > > Petr > I have merged both of these. Thanks, Jim