lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 059/200] crypto: rsa-pkcs1pad - fix dst len
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tadeusz Struk <tadeusz.struk@intel.com>

    commit 6f0904ada402a45b3a0a3b9b6507d91d3a9da67a upstream.

    The output buffer length has to be at least as big as the key_size.
    It is then updated to the actual output size by the implementation.

    Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    crypto/rsa-pkcs1pad.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/crypto/rsa-pkcs1pad.c
    +++ b/crypto/rsa-pkcs1pad.c
    @@ -310,16 +310,16 @@ static int pkcs1pad_decrypt(struct akcip
    req_ctx->child_req.src = req->src;
    req_ctx->child_req.src_len = req->src_len;
    req_ctx->child_req.dst = req_ctx->out_sg;
    - req_ctx->child_req.dst_len = ctx->key_size - 1;
    + req_ctx->child_req.dst_len = ctx->key_size ;

    - req_ctx->out_buf = kmalloc(ctx->key_size - 1,
    + req_ctx->out_buf = kmalloc(ctx->key_size,
    (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ?
    GFP_KERNEL : GFP_ATOMIC);
    if (!req_ctx->out_buf)
    return -ENOMEM;

    pkcs1pad_sg_set_buf(req_ctx->out_sg, req_ctx->out_buf,
    - ctx->key_size - 1, NULL);
    + ctx->key_size, NULL);

    akcipher_request_set_tfm(&req_ctx->child_req, ctx->child);
    akcipher_request_set_callback(&req_ctx->child_req, req->base.flags,
    @@ -491,16 +491,16 @@ static int pkcs1pad_verify(struct akciph
    req_ctx->child_req.src = req->src;
    req_ctx->child_req.src_len = req->src_len;
    req_ctx->child_req.dst = req_ctx->out_sg;
    - req_ctx->child_req.dst_len = ctx->key_size - 1;
    + req_ctx->child_req.dst_len = ctx->key_size;

    - req_ctx->out_buf = kmalloc(ctx->key_size - 1,
    + req_ctx->out_buf = kmalloc(ctx->key_size,
    (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ?
    GFP_KERNEL : GFP_ATOMIC);
    if (!req_ctx->out_buf)
    return -ENOMEM;

    pkcs1pad_sg_set_buf(req_ctx->out_sg, req_ctx->out_buf,
    - ctx->key_size - 1, NULL);
    + ctx->key_size, NULL);

    akcipher_request_set_tfm(&req_ctx->child_req, ctx->child);
    akcipher_request_set_callback(&req_ctx->child_req, req->base.flags,

    \
     
     \ /
      Last update: 2016-05-03 03:01    [W:4.059 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site