lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 379/542] crypto: hisilicon - Bugfixed tfm leak
    Date
    From: Zaibo Xu <xuzaibo@huawei.com>

    [ Upstream commit dfee9955abc7ec9364413d16316181322cf44f2f ]

    1.Fixed the bug of software tfm leakage.
    2.Update HW error log message.

    Signed-off-by: Zaibo Xu <xuzaibo@huawei.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/crypto/hisilicon/hpre/hpre_crypto.c | 7 +++++-
    drivers/crypto/hisilicon/hpre/hpre_main.c | 24 ++++++++++-----------
    2 files changed, 18 insertions(+), 13 deletions(-)

    diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
    index 98f037e6ea3e4..d8b015266ee49 100644
    --- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c
    +++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
    @@ -1043,6 +1043,7 @@ static unsigned int hpre_rsa_max_size(struct crypto_akcipher *tfm)
    static int hpre_rsa_init_tfm(struct crypto_akcipher *tfm)
    {
    struct hpre_ctx *ctx = akcipher_tfm_ctx(tfm);
    + int ret;

    ctx->rsa.soft_tfm = crypto_alloc_akcipher("rsa-generic", 0, 0);
    if (IS_ERR(ctx->rsa.soft_tfm)) {
    @@ -1050,7 +1051,11 @@ static int hpre_rsa_init_tfm(struct crypto_akcipher *tfm)
    return PTR_ERR(ctx->rsa.soft_tfm);
    }

    - return hpre_ctx_init(ctx);
    + ret = hpre_ctx_init(ctx);
    + if (ret)
    + crypto_free_akcipher(ctx->rsa.soft_tfm);
    +
    + return ret;
    }

    static void hpre_rsa_exit_tfm(struct crypto_akcipher *tfm)
    diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c
    index 34e0424410bfc..0c98c37e39f4a 100644
    --- a/drivers/crypto/hisilicon/hpre/hpre_main.c
    +++ b/drivers/crypto/hisilicon/hpre/hpre_main.c
    @@ -106,18 +106,18 @@ static const char * const hpre_debug_file_name[] = {
    };

    static const struct hpre_hw_error hpre_hw_errors[] = {
    - { .int_msk = BIT(0), .msg = "hpre_ecc_1bitt_err" },
    - { .int_msk = BIT(1), .msg = "hpre_ecc_2bit_err" },
    - { .int_msk = BIT(2), .msg = "hpre_data_wr_err" },
    - { .int_msk = BIT(3), .msg = "hpre_data_rd_err" },
    - { .int_msk = BIT(4), .msg = "hpre_bd_rd_err" },
    - { .int_msk = BIT(5), .msg = "hpre_ooo_2bit_ecc_err" },
    - { .int_msk = BIT(6), .msg = "hpre_cltr1_htbt_tm_out_err" },
    - { .int_msk = BIT(7), .msg = "hpre_cltr2_htbt_tm_out_err" },
    - { .int_msk = BIT(8), .msg = "hpre_cltr3_htbt_tm_out_err" },
    - { .int_msk = BIT(9), .msg = "hpre_cltr4_htbt_tm_out_err" },
    - { .int_msk = GENMASK(15, 10), .msg = "hpre_ooo_rdrsp_err" },
    - { .int_msk = GENMASK(21, 16), .msg = "hpre_ooo_wrrsp_err" },
    + { .int_msk = BIT(0), .msg = "core_ecc_1bit_err_int_set" },
    + { .int_msk = BIT(1), .msg = "core_ecc_2bit_err_int_set" },
    + { .int_msk = BIT(2), .msg = "dat_wb_poison_int_set" },
    + { .int_msk = BIT(3), .msg = "dat_rd_poison_int_set" },
    + { .int_msk = BIT(4), .msg = "bd_rd_poison_int_set" },
    + { .int_msk = BIT(5), .msg = "ooo_ecc_2bit_err_int_set" },
    + { .int_msk = BIT(6), .msg = "cluster1_shb_timeout_int_set" },
    + { .int_msk = BIT(7), .msg = "cluster2_shb_timeout_int_set" },
    + { .int_msk = BIT(8), .msg = "cluster3_shb_timeout_int_set" },
    + { .int_msk = BIT(9), .msg = "cluster4_shb_timeout_int_set" },
    + { .int_msk = GENMASK(15, 10), .msg = "ooo_rdrsp_err_int_set" },
    + { .int_msk = GENMASK(21, 16), .msg = "ooo_wrrsp_err_int_set" },
    { /* sentinel */ }
    };

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 16:57    [W:4.022 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site