Commit e43327c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:

 - fix regression in af_alg that affects iwd

 - restore polling delay in qat

 - fix double free in ingenic on error path

 - fix potential build failure in sa2ul due to missing Kconfig dependency

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: af_alg - Work around empty control messages without MSG_MORE
  crypto: sa2ul - add Kconfig selects to fix build error
  crypto: ingenic - Drop kfree for memory allocated with devm_kzalloc
  crypto: qat - add delay before polling mailbox
parents dcc5c6f0 c195d66a

crypto/af_alg.c

+10 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/module.h>

#include <linux/net.h>

#include <linux/rwsem.h>

#include <linux/sched.h>

#include <linux/sched/signal.h>

#include <linux/security.h>
@@ -845,10 +846,16 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, 
	}



	lock_sock(sk);

	if (ctx->init && (init || !ctx->more)) {

	if (ctx->init && !ctx->more) {

		if (ctx->used) {

			err = -EINVAL;

			goto unlock;

		}



		pr_info_once(

			"%s sent an empty control message without MSG_MORE.\n",

			current->comm);

	}

	ctx->init = true;



	if (init) {

drivers/char/hw_random/ingenic-rng.c

+2 −7
Original line number Diff line number Diff line
@@ -92,8 +92,7 @@ static int ingenic_rng_probe(struct platform_device *pdev) 
	priv->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(priv->base)) {

		pr_err("%s: Failed to map RNG registers\n", __func__);

		ret = PTR_ERR(priv->base);

		goto err_free_rng;

		return PTR_ERR(priv->base);

	}



	priv->version = (enum ingenic_rng_version)of_device_get_match_data(&pdev->dev);
@@ -106,17 +105,13 @@ static int ingenic_rng_probe(struct platform_device *pdev) 
	ret = hwrng_register(&priv->rng);

	if (ret) {

		dev_err(&pdev->dev, "Failed to register hwrng\n");

		goto err_free_rng;

		return ret;

	}



	platform_set_drvdata(pdev, priv);



	dev_info(&pdev->dev, "Ingenic RNG driver registered\n");

	return 0;



err_free_rng:

	kfree(priv);

	return ret;

}



static int ingenic_rng_remove(struct platform_device *pdev)

drivers/crypto/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -873,6 +873,9 @@ config CRYPTO_DEV_SA2UL 
	select CRYPTO_AES

	select CRYPTO_AES_ARM64

	select CRYPTO_ALGAPI

	select CRYPTO_SHA1

	select CRYPTO_SHA256

	select CRYPTO_SHA512

	select HW_RANDOM

	select SG_SPLIT

	help

drivers/crypto/qat/qat_common/adf_admin.c

+4 −3
Original line number Diff line number Diff line
@@ -131,9 +131,10 @@ static int adf_put_admin_msg_sync(struct adf_accel_dev *accel_dev, u32 ae, 
	memcpy(admin->virt_addr + offset, in, ADF_ADMINMSG_LEN);

	ADF_CSR_WR(mailbox, mb_offset, 1);



	ret = readl_poll_timeout(mailbox + mb_offset, status,

				 status == 0, ADF_ADMIN_POLL_DELAY_US,

				 ADF_ADMIN_POLL_TIMEOUT_US);

	ret = read_poll_timeout(ADF_CSR_RD, status, status == 0,

				ADF_ADMIN_POLL_DELAY_US,

				ADF_ADMIN_POLL_TIMEOUT_US, true,

				mailbox, mb_offset);

	if (ret < 0) {

		/* Response timeout */

		dev_err(&GET_DEV(accel_dev),

CRA Git | Maintained and supported by SUSTech CRA and CCSE