10 Oct, 2016
1 commit
-
Merge the crypto tree to pull in vmx ghash fix.
02 Oct, 2016
10 commits
-
Even for i.MX, CAAM is able to use address pointers greater than
32 bits, the address pointer field being interpreted as a double word.
Enforce u64 address pointer in the sec4_sg_entry struct.This patch fixes the SGT address pointer endianness issue for
32bit platforms where core endianness != caam endianness.Signed-off-by: Tudor Ambarus
Signed-off-by: Herbert Xu -
Add human-readable strings to log messages about CCP errors
Signed-off-by: Gary R Hook
Signed-off-by: Herbert Xu -
Change names of data structure instances. Add const
keyword where appropriate. Add error handling path.Signed-off-by: Gary R Hook
Signed-off-by: Herbert Xu -
Select CRYPTO_GHASH for vmx_crypto since p8_ghash uses it as the
fallback implementation.Signed-off-by: Marcelo Cerri
Signed-off-by: Herbert Xu -
Add a guard to 'state' buffer and warn if its consistency after
call to crypto_ahash_export() changes, so that any write that
goes beyond advertised statesize (and thus causing potential
memory corruption [1]) is more visible.[1] https://marc.info/?l=linux-crypto-vger&m=147467656516085
Signed-off-by: Jan Stancek
Cc: Herbert Xu
Cc: Marcelo Cerri
Signed-off-by: Herbert Xu -
Free memory mapping, if probe is not successful.
Signed-off-by: Arvind Yadav
Signed-off-by: Herbert Xu -
The driver does not handle endianness properly when loading the input
data.Signed-off-by: Marcelo Cerri
Signed-off-by: Herbert Xu -
The cipher block size for GCM is 16 bytes, and thus the CTR transform
used in crypto_gcm_setkey() will also expect a 16-byte IV. However,
the code currently reserves only 8 bytes for the IV, causing
an out-of-bounds access in the CTR transform. This patch fixes
the issue by setting the size of the IV buffer to 16 bytes.Fixes: 84c911523020 ("[CRYPTO] gcm: Add support for async ciphers")
Signed-off-by: Ondrej Mosnacek
Signed-off-by: Herbert Xu -
This patch changes the p8_ghash driver to use ghash-generic as a fixed
fallback implementation. This allows the correct value of descsize to be
defined directly in its shash_alg structure and avoids problems with
incorrect buffer sizes when its state is exported or imported.Reported-by: Jan Stancek
Fixes: cc333cd68dfa ("crypto: vmx - Adding GHASH routines for VMX module")
Cc: stable@vger.kernel.org
Signed-off-by: Marcelo Cerri
Signed-off-by: Herbert Xu -
Move common values and types used by ghash-generic to a new header file
so drivers can directly use ghash-generic as a fallback implementation.Fixes: cc333cd68dfa ("crypto: vmx - Adding GHASH routines for VMX module")
Cc: stable@vger.kernel.org
Signed-off-by: Marcelo Cerri
Signed-off-by: Herbert Xu
22 Sep, 2016
25 commits
-
Ensure scatterlists have a virtual memory mapping before dumping.
Signed-off-by: Catalin Vasile
Signed-off-by: Herbert Xu -
Currently omap-rng checks the return value of pm_runtime_get_sync and
reports failure if anything is returned, however it should be checking
if ret < 0 as pm_runtime_get_sync return 0 on success but also can return
1 if the device was already active which is not a failure case. Only
values < 0 are actual failures.Fixes: 61dc0a446e5d ("hwrng: omap - Fix assumption that runtime_get_sync will always succeed")
Signed-off-by: Dave Gerlach
Signed-off-by: Herbert Xu -
The current internal buffer size is way too large for crypto core, so
shrink it to be smaller. This makes the buffer to fit into the space
reserved for the export/import buffers also.Signed-off-by: Tero Kristo
Signed-off-by: Herbert Xu -
Now that the driver has been converted to use scatterlists for data
handling, add proper implementation for the export/import stubs also.Signed-off-by: Tero Kristo
Signed-off-by: Herbert Xu -
Currently, the internal buffer has been used for data transmission. Change
this so that scatterlists are used instead, and change the driver to
actually use the previously introduced helper functions for scatterlist
preparation.This patch also removes the old buffer handling code which is no longer
needed.Signed-off-by: Tero Kristo
Signed-off-by: Herbert Xu -
Currently the threshold value was hardcoded in the driver. Having a define
for it makes it easier to configure.Signed-off-by: Tero Kristo
Signed-off-by: Herbert Xu -
Currently omap-sham uses a huge internal buffer for caching data, and
pushing this out to the DMA as large chunks. This, unfortunately,
doesn't work too well with the export/import functionality required
for ahash algorithms, and must be changed towards more scatterlist
centric approach.This patch adds support functions for (mostly) scatterlist based data
handling. omap_sham_prepare_request() prepares a scatterlist for DMA
transfer to SHA crypto accelerator. This requires checking the data /
offset / length alignment of the data, splitting the data to SHA block
size granularity, and adding any remaining data back to the buffer.
With this patch, the code doesn't actually go live yet, the support code
will be taken properly into use with additional patches that modify the
SHA driver functionality itself.Signed-off-by: Tero Kristo
Signed-off-by: Herbert Xu -
The current usage of sgl will be deprecated, and will be replaced by an
array required by the sg based driver implementation. Rename the existing
variable as sgl_tmp so that it can be removed from the driver easily later.Signed-off-by: Tero Kristo
Signed-off-by: Herbert Xu -
OMAP HW generally expects data for DMA to be on word boundary, so make the
SHA driver inform crypto framework of the same preference.Signed-off-by: Tero Kristo
Signed-off-by: Herbert Xu -
Initially these just return -ENOTSUPP to indicate that they don't
really do anything yet. Some sort of implementation is required
for the driver to at least probe.Signed-off-by: Tero Kristo
Signed-off-by: Herbert Xu -
We get 1 warning when building kernel with W=1:
drivers/crypto/sunxi-ss/sun4i-ss-hash.c:168:5: warning: no previous prototype for 'sun4i_hash' [-Wmissing-prototypes]In fact, this function is only used in the file in which it is
declared and don't need a declaration, but can be made static.
So this patch marks it 'static'.Signed-off-by: Baoyou Xie
Signed-off-by: Herbert Xu -
Fix the retrn value check which testing the wrong variable
in ccp_dmaengine_register().Fixes: 58ea8abf4904 ("crypto: ccp - Register the CCP as a DMA resource")
Signed-off-by: Wei Yongjun
Acked-by: Gary R Hook
Signed-off-by: Herbert Xu -
In case of error, the function devm_ioremap() returns NULL pointer
not ERR_PTR(). The IS_ERR() test in the return value check should
be replaced with NULL test.Fixes: 6e9b5e76882c ("hwrng: geode - Migrate to managed API")
Signed-off-by: Wei Yongjun
Signed-off-by: Herbert Xu -
In case of error, the function devm_kzalloc() or devm_ioport_map()
return NULL pointer not ERR_PTR(). The IS_ERR() test in the return
value check should be replaced with NULL test.Fixes: 31b2a73c9c5f ("hwrng: amd - Migrate to managed API")
Signed-off-by: Wei Yongjun
Signed-off-by: Herbert Xu -
Move statements for error handling which were identical
in two if branches to the end of these functions.Signed-off-by: Markus Elfring
Signed-off-by: Herbert Xu -
The local variable "ret" will be set to an appropriate value a bit later.
Thus omit the explicit initialisation at the beginning.Signed-off-by: Markus Elfring
Signed-off-by: Herbert Xu -
* Return a value at the end without storing it in an intermediate variable.
* Delete the local variable "ret" which became unnecessary with
this refactoring.Signed-off-by: Markus Elfring
Signed-off-by: Herbert Xu -
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring
Signed-off-by: Herbert Xu -
Adjust jump labels according to the current Linux coding style convention.
Signed-off-by: Markus Elfring
Signed-off-by: Herbert Xu -
* A multiplication for the size determination of a memory allocation
indicated that an array data structure should be processed.
Thus use the corresponding function "kmalloc_array".This issue was detected by using the Coccinelle software.
* Replace the specification of a data type by a pointer dereference
to make the corresponding size determination a bit safer according to
the Linux coding style convention.Signed-off-by: Markus Elfring
Signed-off-by: Herbert Xu -
Using kmem_cache_zalloc() instead of kmem_cache_alloc() and memset().
Signed-off-by: Wei Yongjun
Acked-by: Gary R Hook
Signed-off-by: Herbert Xu -
Fix to return error code -ENOMEM from the crypto_engine_alloc_init()
error handling case instead of 0, as done elsewhere in this function.Fixes: 0529900a01cb ("crypto: omap-aes - Support crypto engine framework")
Signed-off-by: Wei Yongjun
Signed-off-by: Herbert Xu -
Fix to return error code -ENOMEM from the crypto_engine_alloc_init()
error handling case instead of 0, as done elsewhere in this function.Fixes: f1b77aaca85a ("crypto: omap-des - Integrate with the crypto
engine framework")
Signed-off-by: Wei Yongjun
Signed-off-by: Herbert Xu -
As the software RSA implementation now produces fixed-length
output, we need to eliminate leading zeros in the calling code
instead.This patch does just that for pkcs1pad decryption while signature
verification was fixed in an earlier patch.Fixes: 9b45b7bba3d2 ("crypto: rsa - Generate fixed-length output")
Reported-by: Mat Martineau
Signed-off-by: Herbert Xu -
The IV must not be modified by the skcipher operation so we need
to duplicate it.Fixes: c3917fd9dfbc ("KEYS: Use skcipher")
Cc: stable@vger.kernel.org
Reported-by: Mimi Zohar
Signed-off-by: Herbert Xu
13 Sep, 2016
4 commits
-
Remove unneeded variables and assignments.
Signed-off-by: Masahiro Yamada
Signed-off-by: Herbert Xu -
Fix checkpatch.pl warning by changing from asm/io.h to linux/io.h. In
the mean time arrange the includes in alphabetical order.Signed-off-by: PrasannaKumar Muralidharan
Signed-off-by: Herbert Xu -
Use devm_ioremap and devm_hwrng_register instead of ioremap and
hwrng_register. This removes error handling code. Also moved code around
by removing goto statements. This improves code readability.Signed-off-by: PrasannaKumar Muralidharan
Signed-off-by: Herbert Xu -
Fix the missing clk_disable_unprepare() before return
from st_rng_probe() in the error handling case.Signed-off-by: Wei Yongjun
Acked-by: Patrice Chotard
Acked-by: Peter Griffin
Signed-off-by: Herbert Xu
