On Jul 18, 2023 =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@xxxxxxxxxxxxxx> wrote: > > avtab_search() shares the same logic with avtab_search_node(), except > that it returns, if found, a pointer to the struct avtab_node member > datum instead of the node itself. Since the member is an embedded > struct, and not a pointer, the returned value of avtab_search() and > avtab_search_node() will always in unison either be NULL or non-NULL. > > Drop avtab_search() and replace its calls by avtab_search_node() to > deduplicate logic and adopt the only caller caring for the type of > the returned value accordingly. > > Signed-off-by: Christian Göttsche <cgzones@xxxxxxxxxxxxxx> > --- > security/selinux/ss/avtab.c | 32 ------------------------------- > security/selinux/ss/avtab.h | 1 - > security/selinux/ss/conditional.c | 4 ++-- > security/selinux/ss/services.c | 13 ++++++------- > 4 files changed, 8 insertions(+), 42 deletions(-) Merged into selinux/next, thanks! -- paul-moore.com