lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 137/176] KEYS: trusted: Fix migratable=1 failing
    Date
    From: Jarkko Sakkinen <jarkko@kernel.org>

    commit 8da7520c80468c48f981f0b81fc1be6599e3b0ad upstream.

    Consider the following transcript:

    $ keyctl add trusted kmk "new 32 blobauth=helloworld keyhandle=80000000 migratable=1" @u
    add_key: Invalid argument

    The documentation has the following description:

    migratable= 0|1 indicating permission to reseal to new PCR values,
    default 1 (resealing allowed)

    The consequence is that "migratable=1" should succeed. Fix this by
    allowing this condition to pass instead of return -EINVAL.

    [*] Documentation/security/keys/trusted-encrypted.rst

    Cc: stable@vger.kernel.org
    Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
    Cc: Mimi Zohar <zohar@linux.ibm.com>
    Cc: David Howells <dhowells@redhat.com>
    Fixes: d00a1c72f7f4 ("keys: add new trusted key-type")
    Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    security/keys/trusted.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/security/keys/trusted.c
    +++ b/security/keys/trusted.c
    @@ -797,7 +797,7 @@ static int getoptions(char *c, struct tr
    case Opt_migratable:
    if (*args[0].from == '0')
    pay->migratable = 0;
    - else
    + else if (*args[0].from != '1')
    return -EINVAL;
    break;
    case Opt_pcrlock:

    \
     
     \ /
      Last update: 2021-03-01 20:27    [W:2.422 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site