On Fri, May 1, 2020 at 4:29 PM Ondrej Mosnacek <omosnace@xxxxxxxxxx> wrote: > > On Fri, May 1, 2020 at 10:20 PM Paul Moore <paul@xxxxxxxxxxxxxx> wrote: > > On Tue, Apr 28, 2020 at 8:55 AM Ondrej Mosnacek <omosnace@xxxxxxxxxx> wrote: > > > > > > It is simpler to allocate them statically in the corresponding > > > structure, avoiding unnecessary kmalloc() calls and pointer > > > dereferencing. > > > > > > Signed-off-by: Ondrej Mosnacek <omosnace@xxxxxxxxxx> > > > --- > > > security/selinux/ss/hashtab.c | 51 ++++--------- > > > security/selinux/ss/hashtab.h | 13 ++-- > > > security/selinux/ss/mls.c | 14 ++-- > > > security/selinux/ss/policydb.c | 126 ++++++++++++++++----------------- > > > security/selinux/ss/policydb.h | 6 +- > > > security/selinux/ss/services.c | 44 ++++++------ > > > security/selinux/ss/symtab.c | 5 +- > > > security/selinux/ss/symtab.h | 2 +- > > > 8 files changed, 116 insertions(+), 145 deletions(-) > > > > Merged into selinux/next, thanks. > > It looks like you didn't resolve the conflict with the return value > fix correctly ... There were some stgit/git issues when I was merging patches this afternoon and my tree got a bit messed up (you likely noticed the force pushes); this appears to be a casualty of that. Regardless, it should be fixed now. Thanks for letting me know. -- paul moore www.paul-moore.com
