nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

crypto: api - Check CRYPTO_USER instead of NET for report

Browse source 
The report function is currently conditionalised on CONFIG_NET.
As it's only used by CONFIG_CRYPTO_USER, conditionalising on that
instead of CONFIG_NET makes more sense.

This gets rid of a rarely used code-path.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2023-02-16 18:35:28 +08:00
parent 0c0edf6168
commit c0f9e01dd2
9 changed files with 36 additions and 72 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
crypto/acompress.c
View file

@ -33,8 +33,8 @@ static inline struct acomp_alg *crypto_acomp_alg(struct crypto_acomp *tfm)
return __crypto_acomp_alg(crypto_acomp_tfm(tfm)->__crt_alg); return __crypto_acomp_alg(crypto_acomp_tfm(tfm)->__crt_alg);
} }
#ifdef CONFIG_NET static int __maybe_unused crypto_acomp_report(
static int crypto_acomp_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct crypto_report_acomp racomp; struct crypto_report_acomp racomp;
@ -44,12 +44,6 @@ static int crypto_acomp_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_ACOMP, sizeof(racomp), &racomp); return nla_put(skb, CRYPTOCFGA_REPORT_ACOMP, sizeof(racomp), &racomp);
} }
#else
static int crypto_acomp_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static void crypto_acomp_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_acomp_show(struct seq_file *m, struct crypto_alg *alg)
__maybe_unused; __maybe_unused;
@ -131,7 +125,9 @@ static const struct crypto_type crypto_acomp_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_acomp_show, .show = crypto_acomp_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_acomp_report, .report = crypto_acomp_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_acomp_report_stat, .report_stat = crypto_acomp_report_stat,
#endif #endif

12
crypto/aead.c
View file

@ -175,8 +175,8 @@ static int crypto_aead_init_tfm(struct crypto_tfm *tfm)
return 0; return 0;
} }
#ifdef CONFIG_NET static int __maybe_unused crypto_aead_report(
static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct crypto_report_aead raead; struct crypto_report_aead raead;
struct aead_alg *aead = container_of(alg, struct aead_alg, base); struct aead_alg *aead = container_of(alg, struct aead_alg, base);
@ -192,12 +192,6 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_AEAD, sizeof(raead), &raead); return nla_put(skb, CRYPTOCFGA_REPORT_AEAD, sizeof(raead), &raead);
} }
#else
static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)
__maybe_unused; __maybe_unused;
@ -248,7 +242,9 @@ static const struct crypto_type crypto_aead_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_aead_show, .show = crypto_aead_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_aead_report, .report = crypto_aead_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_aead_report_stat, .report_stat = crypto_aead_report_stat,
#endif #endif

12
crypto/ahash.c
View file

@ -469,8 +469,8 @@ static void crypto_ahash_free_instance(struct crypto_instance *inst)
ahash->free(ahash); ahash->free(ahash);
} }
#ifdef CONFIG_NET static int __maybe_unused crypto_ahash_report(
static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct crypto_report_hash rhash; struct crypto_report_hash rhash;
@ -483,12 +483,6 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_HASH, sizeof(rhash), &rhash); return nla_put(skb, CRYPTOCFGA_REPORT_HASH, sizeof(rhash), &rhash);
} }
#else
static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)
__maybe_unused; __maybe_unused;
@ -515,7 +509,9 @@ static const struct crypto_type crypto_ahash_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_ahash_show, .show = crypto_ahash_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_ahash_report, .report = crypto_ahash_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_ahash_report_stat, .report_stat = crypto_ahash_report_stat,
#endif #endif

12
crypto/akcipher.c
View file

@ -17,8 +17,8 @@
#include "internal.h" #include "internal.h"
#ifdef CONFIG_NET static int __maybe_unused crypto_akcipher_report(
static int crypto_akcipher_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct crypto_report_akcipher rakcipher; struct crypto_report_akcipher rakcipher;
@ -29,12 +29,6 @@ static int crypto_akcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_AKCIPHER, return nla_put(skb, CRYPTOCFGA_REPORT_AKCIPHER,
sizeof(rakcipher), &rakcipher); sizeof(rakcipher), &rakcipher);
} }
#else
static int crypto_akcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_akcipher_show(struct seq_file *m, struct crypto_alg *alg)
__maybe_unused; __maybe_unused;
@ -104,7 +98,9 @@ static const struct crypto_type crypto_akcipher_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_akcipher_show, .show = crypto_akcipher_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_akcipher_report, .report = crypto_akcipher_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_akcipher_report_stat, .report_stat = crypto_akcipher_report_stat,
#endif #endif

12
crypto/kpp.c
View file

@ -17,8 +17,8 @@
#include "internal.h" #include "internal.h"
#ifdef CONFIG_NET static int __maybe_unused crypto_kpp_report(
static int crypto_kpp_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct crypto_report_kpp rkpp; struct crypto_report_kpp rkpp;
@ -28,12 +28,6 @@ static int crypto_kpp_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_KPP, sizeof(rkpp), &rkpp); return nla_put(skb, CRYPTOCFGA_REPORT_KPP, sizeof(rkpp), &rkpp);
} }
#else
static int crypto_kpp_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static void crypto_kpp_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_kpp_show(struct seq_file *m, struct crypto_alg *alg)
__maybe_unused; __maybe_unused;
@ -102,7 +96,9 @@ static const struct crypto_type crypto_kpp_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_kpp_show, .show = crypto_kpp_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_kpp_report, .report = crypto_kpp_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_kpp_report_stat, .report_stat = crypto_kpp_report_stat,
#endif #endif

12
crypto/rng.c
View file

@ -69,8 +69,8 @@ static unsigned int seedsize(struct crypto_alg *alg)
return ralg->seedsize; return ralg->seedsize;
} }
#ifdef CONFIG_NET static int __maybe_unused crypto_rng_report(
static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct crypto_report_rng rrng; struct crypto_report_rng rrng;
@ -82,12 +82,6 @@ static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_RNG, sizeof(rrng), &rrng); return nla_put(skb, CRYPTOCFGA_REPORT_RNG, sizeof(rrng), &rrng);
} }
#else
static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg)
__maybe_unused; __maybe_unused;
@ -124,7 +118,9 @@ static const struct crypto_type crypto_rng_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_rng_show, .show = crypto_rng_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_rng_report, .report = crypto_rng_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_rng_report_stat, .report_stat = crypto_rng_report_stat,
#endif #endif

12
crypto/scompress.c
View file

@ -37,8 +37,8 @@ static const struct crypto_type crypto_scomp_type;
static int scomp_scratch_users; static int scomp_scratch_users;
static DEFINE_MUTEX(scomp_lock); static DEFINE_MUTEX(scomp_lock);
#ifdef CONFIG_NET static int __maybe_unused crypto_scomp_report(
static int crypto_scomp_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct crypto_report_comp rscomp; struct crypto_report_comp rscomp;
@ -49,12 +49,6 @@ static int crypto_scomp_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS, return nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS,
sizeof(rscomp), &rscomp); sizeof(rscomp), &rscomp);
} }
#else
static int crypto_scomp_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static void crypto_scomp_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_scomp_show(struct seq_file *m, struct crypto_alg *alg)
__maybe_unused; __maybe_unused;
@ -246,7 +240,9 @@ static const struct crypto_type crypto_scomp_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_scomp_show, .show = crypto_scomp_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_scomp_report, .report = crypto_scomp_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_acomp_report_stat, .report_stat = crypto_acomp_report_stat,
#endif #endif

12
crypto/shash.c
View file

@ -490,8 +490,8 @@ static void crypto_shash_free_instance(struct crypto_instance *inst)
shash->free(shash); shash->free(shash);
} }
#ifdef CONFIG_NET static int __maybe_unused crypto_shash_report(
static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct crypto_report_hash rhash; struct crypto_report_hash rhash;
struct shash_alg *salg = __crypto_shash_alg(alg); struct shash_alg *salg = __crypto_shash_alg(alg);
@ -505,12 +505,6 @@ static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_HASH, sizeof(rhash), &rhash); return nla_put(skb, CRYPTOCFGA_REPORT_HASH, sizeof(rhash), &rhash);
} }
#else
static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg) static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)
__maybe_unused; __maybe_unused;
@ -536,7 +530,9 @@ static const struct crypto_type crypto_shash_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_shash_show, .show = crypto_shash_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_shash_report, .report = crypto_shash_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_shash_report_stat, .report_stat = crypto_shash_report_stat,
#endif #endif

12
crypto/skcipher.c
View file

@ -727,8 +727,8 @@ static void crypto_skcipher_show(struct seq_file *m, struct crypto_alg *alg)
seq_printf(m, "walksize : %u\n", skcipher->walksize); seq_printf(m, "walksize : %u\n", skcipher->walksize);
} }
#ifdef CONFIG_NET static int __maybe_unused crypto_skcipher_report(
static int crypto_skcipher_report(struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
{ {
struct skcipher_alg *skcipher = __crypto_skcipher_alg(alg); struct skcipher_alg *skcipher = __crypto_skcipher_alg(alg);
struct crypto_report_blkcipher rblkcipher; struct crypto_report_blkcipher rblkcipher;
@ -746,12 +746,6 @@ static int crypto_skcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
return nla_put(skb, CRYPTOCFGA_REPORT_BLKCIPHER, return nla_put(skb, CRYPTOCFGA_REPORT_BLKCIPHER,
sizeof(rblkcipher), &rblkcipher); sizeof(rblkcipher), &rblkcipher);
} }
#else
static int crypto_skcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
{
return -ENOSYS;
}
#endif
static int __maybe_unused crypto_skcipher_report_stat( static int __maybe_unused crypto_skcipher_report_stat(
struct sk_buff *skb, struct crypto_alg *alg) struct sk_buff *skb, struct crypto_alg *alg)
@ -782,7 +776,9 @@ static const struct crypto_type crypto_skcipher_type = {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
.show = crypto_skcipher_show, .show = crypto_skcipher_show,
#endif #endif
#ifdef CONFIG_CRYPTO_USER
.report = crypto_skcipher_report, .report = crypto_skcipher_report,
#endif
#ifdef CONFIG_CRYPTO_STATS #ifdef CONFIG_CRYPTO_STATS
.report_stat = crypto_skcipher_report_stat, .report_stat = crypto_skcipher_report_stat,
#endif #endif