crypto: sun4i-ss - Fix PM reference leak when pm_runtime_get_sync() fails

pm_runtime_get_sync will increment pm usage counter even it failed.
Forgetting to putting operation will result in reference leak here.
Fix it by replacing it with pm_runtime_resume_and_get to keep usage
counter balanced.

Signed-off-by: Shixin Liu <liushixin2@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
index c2e6f5ed1d79744a7bc0b0e4179fdf81c9cd8ec7..dec79fa3ebafb83951901b07044ee1f994639c93 100644 (file)
--- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
+++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-cipher.c
@@ -561,7 +561,7 @@ int sun4i_ss_cipher_init(struct crypto_tfm *tfm)
                                    sizeof(struct sun4i_cipher_req_ctx) +
                                    crypto_skcipher_reqsize(op->fallback_tfm));
 
-       err = pm_runtime_get_sync(op->ss->dev);
+       err = pm_runtime_resume_and_get(op->ss->dev);
        if (err < 0)
                goto error_pm;
 

diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c
index ef224d5e4903df87d94f64f03533138eef0c7f71..44b8fc4b786dc8c724373c415d3e8ecc409e1753 100644 (file)
--- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c
+++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c
@@ -454,7 +454,7 @@ static int sun4i_ss_probe(struct platform_device *pdev)
         * this info could be useful
         */
 
-       err = pm_runtime_get_sync(ss->dev);
+       err = pm_runtime_resume_and_get(ss->dev);
        if (err < 0)
                goto error_pm;
 

diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c
index c1b4585e9bbc7d459bfb6c47d66adbf145735f9a..d28292762b3247a6c999b6f382d28a25d6c7fabe 100644 (file)
--- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c
+++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c
@@ -27,7 +27,7 @@ int sun4i_hash_crainit(struct crypto_tfm *tfm)
        algt = container_of(alg, struct sun4i_ss_alg_template, alg.hash);
        op->ss = algt->ss;
 
-       err = pm_runtime_get_sync(op->ss->dev);
+       err = pm_runtime_resume_and_get(op->ss->dev);
        if (err < 0)
                return err;
 

diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-prng.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-prng.c
index 443160a114bb031a0d53e78106d82eb01c0e51a5..491fcb7b81b40b6f989bb27d9414804d81bd23cc 100644 (file)
--- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-prng.c
+++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-prng.c
@@ -29,7 +29,7 @@ int sun4i_ss_prng_generate(struct crypto_rng *tfm, const u8 *src,
        algt = container_of(alg, struct sun4i_ss_alg_template, alg.rng);
        ss = algt->ss;
 
-       err = pm_runtime_get_sync(ss->dev);
+       err = pm_runtime_resume_and_get(ss->dev);
        if (err < 0)
                return err;