Commit ce8fd050 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Herbert Xu
Browse files

crypto: qce - use __free() for a buffer that's always freed 



The buffer allocated in qce_ahash_hmac_setkey is always freed before
returning to use __free() to automate it.

Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c151535c

drivers/crypto/qce/sha.c

+3 −3
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.

 */



#include <linux/cleanup.h>

#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/interrupt.h>
@@ -336,7 +337,6 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, 
	struct scatterlist sg;

	unsigned int blocksize;

	struct crypto_ahash *ahash_tfm;

	u8 *buf;

	int ret;

	const char *alg_name;
@@ -370,7 +370,8 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, 
				   crypto_req_done, &wait);

	crypto_ahash_clear_flags(ahash_tfm, ~0);



	buf = kzalloc(keylen + QCE_MAX_ALIGN_SIZE, GFP_KERNEL);

	u8 *buf __free(kfree) = kzalloc(keylen + QCE_MAX_ALIGN_SIZE,

					GFP_KERNEL);

	if (!buf) {

		ret = -ENOMEM;

		goto err_free_req;
@@ -382,7 +383,6 @@ static int qce_ahash_hmac_setkey(struct crypto_ahash *tfm, const u8 *key, 


	ret = crypto_wait_req(crypto_ahash_digest(req), &wait);



	kfree(buf);

err_free_req:

	ahash_request_free(req);

err_free_ahash: