Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (d8fc9cde) · Commits · 戴 / test

drivers/crypto/hisilicon/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ config CRYPTO_DEV_HISI_SEC2
		select CRYPTO_SHA256
		select CRYPTO_SHA512
		depends on PCI && PCI_MSI
		depends on UACCE \|\| UACCE=n
		depends on ARM64 \|\| (COMPILE_TEST && 64BIT)
		help
		Support for HiSilicon SEC Engine of version 2 in crypto subsystem.
		@@ -58,6 +59,7 @@ config CRYPTO_DEV_HISI_ZIP
		config CRYPTO_DEV_HISI_HPRE
		tristate "Support for HISI HPRE accelerator"
		depends on PCI && PCI_MSI
		depends on UACCE \|\| UACCE=n
		depends on ARM64 \|\| (COMPILE_TEST && 64BIT)
		select CRYPTO_DEV_HISI_QM
		select CRYPTO_DH

+5 −3

Original line number	Diff line number	Diff line
		@@ -1161,13 +1161,13 @@ static inline u32 create_aead_null_output_list(struct aead_request *req,
		inputlen);
		if (status != inputlen) {
		status = -EINVAL;
		goto error;
		goto error_free;
		}
		status = sg_copy_from_buffer(req->dst, sg_nents(req->dst), ptr,
		inputlen);
		if (status != inputlen) {
		status = -EINVAL;
		goto error;
		goto error_free;
		}
		kfree(ptr);
		}
		@@ -1209,8 +1209,10 @@ static inline u32 create_aead_null_output_list(struct aead_request *req,

		req_info->outcnt = argcnt;
		return 0;
		error:

		error_free:
		kfree(ptr);
		error:
		return status;
		}