iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse Source 
Pull crypto fixes from Herbert Xu:
 "This fixes the aesni setkey error and removes a couple of unnecessary
  NULL checks in the Intel qat driver"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni - fix failing setkey for rfc4106-gcm-aesni
  crypto: qat - Deletion of unnecessary checks before two function calls
This commit is contained in:
Linus Torvalds 2015-07-01 15:12:50 -07:00
commit 8fff77551a
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/crypto/aesni-intel_glue.c
View File

@ -1537,7 +1537,7 @@ static void __exit aesni_exit(void)
crypto_fpu_exit(); crypto_fpu_exit();
} }
module_init(aesni_init); late_initcall(aesni_init);
module_exit(aesni_exit); module_exit(aesni_exit);
MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized"); MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm, Intel AES-NI instructions optimized");

5
drivers/crypto/qat/qat_common/adf_accel_engine.c
View File

@ -88,10 +88,7 @@ void adf_ae_fw_release(struct adf_accel_dev *accel_dev)
qat_uclo_del_uof_obj(loader_data->fw_loader); qat_uclo_del_uof_obj(loader_data->fw_loader);
qat_hal_deinit(loader_data->fw_loader); qat_hal_deinit(loader_data->fw_loader);
release_firmware(loader_data->uof_fw);
if (loader_data->uof_fw)
release_firmware(loader_data->uof_fw);
loader_data->uof_fw = NULL; loader_data->uof_fw = NULL;
loader_data->fw_loader = NULL; loader_data->fw_loader = NULL;
} }

2
drivers/crypto/qat/qat_common/adf_transport.c
View File

@ -449,7 +449,7 @@ static int adf_init_bank(struct adf_accel_dev *accel_dev,
err: err:
for (i = 0; i < ADF_ETR_MAX_RINGS_PER_BANK; i++) { for (i = 0; i < ADF_ETR_MAX_RINGS_PER_BANK; i++) {
ring = &bank->rings[i]; ring = &bank->rings[i];
if (hw_data->tx_rings_mask & (1 << i) && ring->inflights) if (hw_data->tx_rings_mask & (1 << i))
kfree(ring->inflights); kfree(ring->inflights);
} }
return -ENOMEM; return -ENOMEM;