On Fri, Mar 27, 2020 at 1:44 PM Colin King <colin.king@xxxxxxxxxxxxx> wrote:
>
> From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
>
> The assignment of e->type_names is indented one level too deep,
> clean this up by removing the extraneous tab.
>
> Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> ---
> security/selinux/ss/policydb.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
I generally dislike style/formatting only changes, but one could argue
that this is just plain wrong regardless of how you like your code to
look.
I also dislike merging changes into selinux/next when we are at -rc7,
but this is trivial and obviously correct.
However, despite not wanting to merge this into selinux/next I decided
to do just that - thanks for the fix. :)
> diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
> index 932b2b9bcdb2..70ecdc78efbd 100644
> --- a/security/selinux/ss/policydb.c
> +++ b/security/selinux/ss/policydb.c
> @@ -1219,10 +1219,9 @@ static int read_cons_helper(struct policydb *p,
> if (rc)
> return rc;
> if (p->policyvers >=
> - POLICYDB_VERSION_CONSTRAINT_NAMES) {
> - e->type_names = kzalloc(sizeof
> - (*e->type_names),
> - GFP_KERNEL);
> + POLICYDB_VERSION_CONSTRAINT_NAMES) {
> + e->type_names = kzalloc(sizeof
> + (*e->type_names), GFP_KERNEL);
> if (!e->type_names)
> return -ENOMEM;
> type_set_init(e->type_names);
> --
> 2.25.1
--
paul moore
www.paul-moore.com
