mirror of
https://github.com/torvalds/linux.git
synced 2025-11-03 18:20:25 +02:00
453431a549
As said by Linus: A symmetric naming is only helpful if it implies symmetries in use. Otherwise it's actively misleading. In "kzalloc()", the z is meaningful and an important part of what the caller wants. In "kzfree()", the z is actively detrimental, because maybe in the future we really _might_ want to use that "memfill(0xdeadbeef)" or something. The "zero" part of the interface isn't even _relevant_. The main reason that kzfree() exists is to clear sensitive information that should not be leaked to other future users of the same memory objects. Rename kzfree() to kfree_sensitive() to follow the example of the recently added kvfree_sensitive() and make the intention of the API more explicit. In addition, memzero_explicit() is used to clear the memory to make sure that it won't get optimized away by the compiler. The renaming is done by using the command sequence: git grep -w --name-only kzfree |\ xargs sed -i 's/kzfree/kfree_sensitive/' followed by some editing of the kfree_sensitive() kerneldoc and adding a kzfree backward compatibility macro in slab.h. [akpm@linux-foundation.org: fs/crypto/inline_crypt.c needs linux/slab.h] [akpm@linux-foundation.org: fix fs/crypto/inline_crypt.c some more] Suggested-by: Joe Perches <joe@perches.com> Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: David Howells <dhowells@redhat.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Cc: James Morris <jmorris@namei.org> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: Joe Perches <joe@perches.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: David Rientjes <rientjes@google.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: "Jason A . Donenfeld" <Jason@zx2c4.com> Link: http://lkml.kernel.org/r/20200616154311.12314-3-longman@redhat.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
112 lines
2.6 KiB
C
112 lines
2.6 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright 2003-2004, Instant802 Networks, Inc.
|
|
* Copyright 2005-2006, Devicescape Software, Inc.
|
|
* Copyright 2014-2015, Qualcomm Atheros, Inc.
|
|
*
|
|
* Rewrite: Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
#include <linux/err.h>
|
|
#include <linux/scatterlist.h>
|
|
#include <crypto/aead.h>
|
|
|
|
#include "aead_api.h"
|
|
|
|
int aead_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,
|
|
u8 *data, size_t data_len, u8 *mic)
|
|
{
|
|
size_t mic_len = crypto_aead_authsize(tfm);
|
|
struct scatterlist sg[3];
|
|
struct aead_request *aead_req;
|
|
int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
|
|
u8 *__aad;
|
|
|
|
aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC);
|
|
if (!aead_req)
|
|
return -ENOMEM;
|
|
|
|
__aad = (u8 *)aead_req + reqsize;
|
|
memcpy(__aad, aad, aad_len);
|
|
|
|
sg_init_table(sg, 3);
|
|
sg_set_buf(&sg[0], __aad, aad_len);
|
|
sg_set_buf(&sg[1], data, data_len);
|
|
sg_set_buf(&sg[2], mic, mic_len);
|
|
|
|
aead_request_set_tfm(aead_req, tfm);
|
|
aead_request_set_crypt(aead_req, sg, sg, data_len, b_0);
|
|
aead_request_set_ad(aead_req, sg[0].length);
|
|
|
|
crypto_aead_encrypt(aead_req);
|
|
kfree_sensitive(aead_req);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len,
|
|
u8 *data, size_t data_len, u8 *mic)
|
|
{
|
|
size_t mic_len = crypto_aead_authsize(tfm);
|
|
struct scatterlist sg[3];
|
|
struct aead_request *aead_req;
|
|
int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm);
|
|
u8 *__aad;
|
|
int err;
|
|
|
|
if (data_len == 0)
|
|
return -EINVAL;
|
|
|
|
aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC);
|
|
if (!aead_req)
|
|
return -ENOMEM;
|
|
|
|
__aad = (u8 *)aead_req + reqsize;
|
|
memcpy(__aad, aad, aad_len);
|
|
|
|
sg_init_table(sg, 3);
|
|
sg_set_buf(&sg[0], __aad, aad_len);
|
|
sg_set_buf(&sg[1], data, data_len);
|
|
sg_set_buf(&sg[2], mic, mic_len);
|
|
|
|
aead_request_set_tfm(aead_req, tfm);
|
|
aead_request_set_crypt(aead_req, sg, sg, data_len + mic_len, b_0);
|
|
aead_request_set_ad(aead_req, sg[0].length);
|
|
|
|
err = crypto_aead_decrypt(aead_req);
|
|
kfree_sensitive(aead_req);
|
|
|
|
return err;
|
|
}
|
|
|
|
struct crypto_aead *
|
|
aead_key_setup_encrypt(const char *alg, const u8 key[],
|
|
size_t key_len, size_t mic_len)
|
|
{
|
|
struct crypto_aead *tfm;
|
|
int err;
|
|
|
|
tfm = crypto_alloc_aead(alg, 0, CRYPTO_ALG_ASYNC);
|
|
if (IS_ERR(tfm))
|
|
return tfm;
|
|
|
|
err = crypto_aead_setkey(tfm, key, key_len);
|
|
if (err)
|
|
goto free_aead;
|
|
err = crypto_aead_setauthsize(tfm, mic_len);
|
|
if (err)
|
|
goto free_aead;
|
|
|
|
return tfm;
|
|
|
|
free_aead:
|
|
crypto_free_aead(tfm);
|
|
return ERR_PTR(err);
|
|
}
|
|
|
|
void aead_key_free(struct crypto_aead *tfm)
|
|
{
|
|
crypto_free_aead(tfm);
|
|
}
|