diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:41:09 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:42:11 +0100 |
| commit | db85fba98caa6ea9e54e93b33df8fdbadf6d20df (patch) | |
| tree | 14b6f6d514b25ffb16981a2867c6902edf41b685 /crypto/vmac.c | |
| parent | 6de0bdb30d75edcf5f1e3f80da5b65670b9831f1 (diff) | |
| parent | 3dc713711de22ba8a1e66049fb4c824f48547727 (diff) | |
| download | linux-crypto-db85fba98caa6ea9e54e93b33df8fdbadf6d20df.tar.gz linux-crypto-db85fba98caa6ea9e54e93b33df8fdbadf6d20df.zip | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
This branch contains a couple of changes that will conflict with the
Tegra SMMU driver rewrite. Since the driver is largely rewritten the
conflict resolution is non-trivial.
Diffstat (limited to 'crypto/vmac.c')
| -rw-r--r-- | crypto/vmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/vmac.c b/crypto/vmac.c index 2eb11a30..d84c24bd 100644 --- a/crypto/vmac.c +++ b/crypto/vmac.c @@ -613,7 +613,7 @@ static int vmac_final(struct shash_desc *pdesc, u8 *out) } mac = vmac(ctx->partial, ctx->partial_size, nonce, NULL, ctx); memcpy(out, &mac, sizeof(vmac_t)); - memset(&mac, 0, sizeof(vmac_t)); + memzero_explicit(&mac, sizeof(vmac_t)); memset(&ctx->__vmac_ctx, 0, sizeof(struct vmac_ctx)); ctx->partial_size = 0; return 0; |