summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-04-14 20:37:09 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2019-04-25 03:38:12 -0400
commit877b5691f27a1aec0d9b53095a323e45c30069e2 (patch)
tree59eba93e8d253fb0e12a0a2040de99e96e873933 /security/apparmor
parent75f2222832e0fecba7a45ca6ac07ea895ea1e046 (diff)
crypto: shash - remove shash_desc::flags
The flags field in 'struct shash_desc' never actually does anything. The only ostensibly supported flag is CRYPTO_TFM_REQ_MAY_SLEEP. However, no shash algorithm ever sleeps, making this flag a no-op. With this being the case, inevitably some users who can't sleep wrongly pass MAY_SLEEP. These would all need to be fixed if any shash algorithm actually started sleeping. For example, the shash_ahash_*() functions, which wrap a shash algorithm with the ahash API, pass through MAY_SLEEP from the ahash API to the shash API. However, the shash functions are called under kmap_atomic(), so actually they're assumed to never sleep. Even if it turns out that some users do need preemption points while hashing large buffers, we could easily provide a helper function crypto_shash_update_large() which divides the data into smaller chunks and calls crypto_shash_update() and cond_resched() for each chunk. It's not necessary to have a flag in 'struct shash_desc', nor is it necessary to make individual shash algorithms aware of this at all. Therefore, remove shash_desc::flags, and document that the crypto_shash_*() functions can be called from any context. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/crypto.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/security/apparmor/crypto.c b/security/apparmor/crypto.c
index af03d98c7552..baba63bc66b1 100644
--- a/security/apparmor/crypto.c
+++ b/security/apparmor/crypto.c
@@ -43,7 +43,6 @@ char *aa_calc_hash(void *data, size_t len)
43 goto fail; 43 goto fail;
44 44
45 desc->tfm = apparmor_tfm; 45 desc->tfm = apparmor_tfm;
46 desc->flags = 0;
47 46
48 error = crypto_shash_init(desc); 47 error = crypto_shash_init(desc);
49 if (error) 48 if (error)
@@ -81,7 +80,6 @@ int aa_calc_profile_hash(struct aa_profile *profile, u32 version, void *start,
81 goto fail; 80 goto fail;
82 81
83 desc->tfm = apparmor_tfm; 82 desc->tfm = apparmor_tfm;
84 desc->flags = 0;
85 83
86 error = crypto_shash_init(desc); 84 error = crypto_shash_init(desc);
87 if (error) 85 if (error)