lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 021/268] ext4 crypto: add missing locking for keyring_key access
    Date
    4.2.8-ckt3 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Theodore Ts'o <tytso@mit.edu>

    commit db7730e3091a52c2fcd8fcc952b964d88998e675 upstream.

    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/ext4/crypto_key.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/fs/ext4/crypto_key.c b/fs/ext4/crypto_key.c
    index dde261b..5c13735 100644
    --- a/fs/ext4/crypto_key.c
    +++ b/fs/ext4/crypto_key.c
    @@ -213,9 +213,11 @@ retry:
    res = -ENOKEY;
    goto out;
    }
    + down_read(&keyring_key->sem);
    ukp = ((struct user_key_payload *)keyring_key->payload.data);
    if (ukp->datalen != sizeof(struct ext4_encryption_key)) {
    res = -EINVAL;
    + up_read(&keyring_key->sem);
    goto out;
    }
    master_key = (struct ext4_encryption_key *)ukp->data;
    @@ -226,10 +228,12 @@ retry:
    "ext4: key size incorrect: %d\n",
    master_key->size);
    res = -ENOKEY;
    + up_read(&keyring_key->sem);
    goto out;
    }
    res = ext4_derive_key_aes(ctx.nonce, master_key->raw,
    raw_key);
    + up_read(&keyring_key->sem);
    if (res)
    goto out;
    got_key:
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-27 23:21    [W:4.183 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site