Re: [PATCH] ima: cleanup the match_token policy code

From: Al Viro
Date: Mon Dec 17 2018 - 20:33:57 EST


On Mon, Dec 17, 2018 at 04:36:54PM -0800, Linus Torvalds wrote:
> On Mon, Dec 17, 2018 at 4:14 PM Mimi Zohar <zohar@xxxxxxxxxxxxx> wrote:
> >
> > Start the policy_tokens and the associated enumeration from zero,
> > simplifying the pt macro.
>
> I applied this directly, since I decided to just commit my own "don't
> use negative Opt_err" patch for the test_and_set_bit() cases, and they
> kind of go together.
>
> There's still a -1 in security/keys/encrypted-keys/encrypted.c, and
> there are also three cases of "Opt_error = -1" in the security layer.
>
> All of which look pointless and wrong, but not actively buggy, so I'll
> leave them alone.

FWIW, that part of LSM shite is getting taken out and shot - LSM-related
preps in the beginning of mount API series are, at the moment, at
fs/btrfs/ctree.h | 4 -
fs/btrfs/super.c | 82 ++-------
fs/namespace.c | 9 +-
fs/nfs/internal.h | 2 +-
fs/nfs/super.c | 34 ++--
fs/super.c | 23 +--
include/linux/lsm_hooks.h | 17 +-
include/linux/security.h | 82 ++-------
security/security.c | 39 +++--
security/selinux/hooks.c | 798 ++++++++++++++++++++++++++++++++------------------------------------------------------
security/smack/smack_lsm.c | 359 +++++++++++++++------------------------
11 files changed, 523 insertions(+), 926 deletions(-)
and unlike the original variant there's not much touched in security/*
further in the series...

No match_token() uses left in there after this part.