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
Unified · Split
| @@ -16,6 +16,7 @@ · 15 unmodified lines | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/net.h> | 17 | #include <linux/net.h> |
| 18 | #include <linux/rwsem.h> | 18 | #include <linux/rwsem.h> |
| 19 | #include <linux/sched.h> | ||
| 19 | #include <linux/sched/signal.h> | 20 | #include <linux/sched/signal.h> |
| 20 | #include <linux/security.h> | 21 | #include <linux/security.h> |
| 21 | 22 | ||
| @@ -845,9 +846,15 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, · 823 unmodified lines | |||
| 845 | } | 846 | } |
| 846 | 847 | ||
| 847 | lock_sock(sk); | 848 | lock_sock(sk); |
| 848 | if (ctx->init && (init || !ctx->more)) { | 849 | if (ctx->init && !ctx->more) { |
| 849 | err = -EINVAL; | 850 | if (ctx->used) { |
| 850 | goto unlock; | 851 | err = -EINVAL; |
| 852 | goto unlock; | ||
| 853 | } | ||
| 854 | |||
| 855 | pr_info_once( | ||
| 856 | "%s sent an empty control message without MSG_MORE.\n", | ||
| 857 | current->comm); | ||
| 851 | } | 858 | } |
| 852 | ctx->init = true; | 859 | ctx->init = true; |
| 853 | 860 | ||
| @@ -92,8 +92,7 @@ static int ingenic_rng_probe(struct platform_device *pdev) · 91 unmodified lines | |||
| 92 | priv->base = devm_platform_ioremap_resource(pdev, 0); | 92 | priv->base = devm_platform_ioremap_resource(pdev, 0); |
| 93 | if (IS_ERR(priv->base)) { | 93 | if (IS_ERR(priv->base)) { |
| 94 | pr_err("%s: Failed to map RNG registers\n", __func__); | 94 | pr_err("%s: Failed to map RNG registers\n", __func__); |
| 95 | ret = PTR_ERR(priv->base); | 95 | return PTR_ERR(priv->base); |
| 96 | goto err_free_rng; | ||
| 97 | } | 96 | } |
| 98 | 97 | ||
| 99 | priv->version = (enum ingenic_rng_version)of_device_get_match_data(&pdev->dev); | 98 | 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) · 6 unmodified lines | |||
| 106 | ret = hwrng_register(&priv->rng); | 105 | ret = hwrng_register(&priv->rng); |
| 107 | if (ret) { | 106 | if (ret) { |
| 108 | dev_err(&pdev->dev, "Failed to register hwrng\n"); | 107 | dev_err(&pdev->dev, "Failed to register hwrng\n"); |
| 109 | goto err_free_rng; | 108 | return ret; |
| 110 | } | 109 | } |
| 111 | 110 | ||
| 112 | platform_set_drvdata(pdev, priv); | 111 | platform_set_drvdata(pdev, priv); |
| 113 | 112 | ||
| 114 | dev_info(&pdev->dev, "Ingenic RNG driver registered\n"); | 113 | dev_info(&pdev->dev, "Ingenic RNG driver registered\n"); |
| 115 | return 0; | 114 | return 0; |
| 116 | |||
| 117 | err_free_rng: | ||
| 118 | kfree(priv); | ||
| 119 | return ret; | ||
| 120 | } | 115 | } |
| 121 | 116 | ||
| 122 | static int ingenic_rng_remove(struct platform_device *pdev) | 117 | static int ingenic_rng_remove(struct platform_device *pdev) |
| @@ -873,6 +873,9 @@ config CRYPTO_DEV_SA2UL · 872 unmodified lines | |||
| 873 | select CRYPTO_AES | 873 | select CRYPTO_AES |
| 874 | select CRYPTO_AES_ARM64 | 874 | select CRYPTO_AES_ARM64 |
| 875 | select CRYPTO_ALGAPI | 875 | select CRYPTO_ALGAPI |
| 876 | select CRYPTO_SHA1 | ||
| 877 | select CRYPTO_SHA256 | ||
| 878 | select CRYPTO_SHA512 | ||
| 876 | select HW_RANDOM | 879 | select HW_RANDOM |
| 877 | select SG_SPLIT | 880 | select SG_SPLIT |
| 878 | help | 881 | help |
| @@ -131,9 +131,10 @@ static int adf_put_admin_msg_sync(struct adf_accel_dev *accel_dev, u32 ae, · 130 unmodified lines | |||
| 131 | memcpy(admin->virt_addr + offset, in, ADF_ADMINMSG_LEN); | 131 | memcpy(admin->virt_addr + offset, in, ADF_ADMINMSG_LEN); |
| 132 | ADF_CSR_WR(mailbox, mb_offset, 1); | 132 | ADF_CSR_WR(mailbox, mb_offset, 1); |
| 133 | 133 | ||
| 134 | ret = readl_poll_timeout(mailbox + mb_offset, status, | 134 | ret = read_poll_timeout(ADF_CSR_RD, status, status == 0, |
| 135 | status == 0, ADF_ADMIN_POLL_DELAY_US, | 135 | ADF_ADMIN_POLL_DELAY_US, |
| 136 | ADF_ADMIN_POLL_TIMEOUT_US); | 136 | ADF_ADMIN_POLL_TIMEOUT_US, true, |
| 137 | mailbox, mb_offset); | ||
| 137 | if (ret < 0) { | 138 | if (ret < 0) { |
| 138 | /* Response timeout */ | 139 | /* Response timeout */ |
| 139 | dev_err(&GET_DEV(accel_dev), | 140 | dev_err(&GET_DEV(accel_dev), |