* [PATCH 0/12] Do not include crypto/algapi.h
@ 2023-08-23 10:30 Herbert Xu
2023-08-23 10:32 ` [PATCH 1/12] fscrypt: " Herbert Xu
` (11 more replies)
0 siblings, 12 replies; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:30 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Neil Brown, linux-nfs, Mimi Zohar, linux-integrity,
Jason A. Donenfeld, Ayush Sawal
Hi:
The header file crypto/algapi.h is for internal use only. There is
no reason to use it outside of the Crypto API. Most uses of it
outside of the API should use crypto/utils.h instead.
Feel free to apply this patch to your tree directly. Just send me
a reply and I'll drop it from my patch queue.
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 1/12] fscrypt: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-25 21:13 ` Eric Biggers
2023-08-23 10:32 ` [PATCH 2/12] ubifs: " Herbert Xu
` (10 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
fs/crypto/keysetup_v1.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/crypto/keysetup_v1.c b/fs/crypto/keysetup_v1.c
index 75dabd9b27f9..d698ecb9ad44 100644
--- a/fs/crypto/keysetup_v1.c
+++ b/fs/crypto/keysetup_v1.c
@@ -20,8 +20,8 @@
* managed alongside the master keys in the filesystem-level keyring)
*/
-#include <crypto/algapi.h>
#include <crypto/skcipher.h>
+#include <crypto/utils.h>
#include <keys/user-type.h>
#include <linux/hashtable.h>
#include <linux/scatterlist.h>
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 2/12] ubifs: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
2023-08-23 10:32 ` [PATCH 1/12] fscrypt: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-26 6:58 ` kernel test robot
2023-08-27 1:40 ` [PATCH 2/12] ubifs: Do not include crypto/algapi.h kernel test robot
2023-08-23 10:32 ` [PATCH 3/12] Bluetooth: " Herbert Xu
` (9 subsequent siblings)
11 siblings, 2 replies; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
fs/ubifs/auth.c | 3 +--
fs/ubifs/replay.c | 1 -
fs/ubifs/ubifs.h | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/ubifs/auth.c b/fs/ubifs/auth.c
index e564d5ff8781..0d561ecb6869 100644
--- a/fs/ubifs/auth.c
+++ b/fs/ubifs/auth.c
@@ -9,10 +9,9 @@
* This file implements various helper functions for UBIFS authentication support
*/
-#include <linux/crypto.h>
#include <linux/verification.h>
#include <crypto/hash.h>
-#include <crypto/algapi.h>
+#include <crypto/utils.h>
#include <keys/user-type.h>
#include <keys/asymmetric-type.h>
diff --git a/fs/ubifs/replay.c b/fs/ubifs/replay.c
index 4211e4456b1e..c59d47fe7939 100644
--- a/fs/ubifs/replay.c
+++ b/fs/ubifs/replay.c
@@ -23,7 +23,6 @@
#include "ubifs.h"
#include <linux/list_sort.h>
#include <crypto/hash.h>
-#include <crypto/algapi.h>
/**
* struct replay_entry - replay list entry.
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 4c36044140e7..fd66ed0cd612 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -31,7 +31,7 @@
#include <linux/completion.h>
#include <crypto/hash_info.h>
#include <crypto/hash.h>
-#include <crypto/algapi.h>
+#include <crypto/utils.h>
#include <linux/fscrypt.h>
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 3/12] Bluetooth: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
2023-08-23 10:32 ` [PATCH 1/12] fscrypt: " Herbert Xu
2023-08-23 10:32 ` [PATCH 2/12] ubifs: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-25 21:23 ` Luiz Augusto von Dentz
2023-08-23 10:32 ` [PATCH 4/12] ceph: " Herbert Xu
` (8 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
net/bluetooth/smp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index f1a9fc0012f0..5f2f97de295e 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -22,11 +22,10 @@
#include <linux/debugfs.h>
#include <linux/scatterlist.h>
-#include <linux/crypto.h>
#include <crypto/aes.h>
-#include <crypto/algapi.h>
#include <crypto/hash.h>
#include <crypto/kpp.h>
+#include <crypto/utils.h>
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 4/12] ceph: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (2 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 3/12] Bluetooth: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-23 20:53 ` Ilya Dryomov
2023-08-23 10:32 ` [PATCH 5/12] ah: " Herbert Xu
` (7 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
net/ceph/messenger_v2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c
index 1a888b86a494..4aab32144833 100644
--- a/net/ceph/messenger_v2.c
+++ b/net/ceph/messenger_v2.c
@@ -8,9 +8,9 @@
#include <linux/ceph/ceph_debug.h>
#include <crypto/aead.h>
-#include <crypto/algapi.h> /* for crypto_memneq() */
#include <crypto/hash.h>
#include <crypto/sha2.h>
+#include <crypto/utils.h>
#include <linux/bvec.h>
#include <linux/crc32c.h>
#include <linux/net.h>
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 5/12] ah: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (3 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 4/12] ceph: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-23 10:32 ` [PATCH 6/12] wifi: mac80211: " Herbert Xu
` (6 subsequent siblings)
11 siblings, 0 replies; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
net/ipv4/ah4.c | 2 +-
net/ipv6/ah6.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 015c0f4ec5ba..bc0f968c5d5b 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only
#define pr_fmt(fmt) "IPsec: " fmt
-#include <crypto/algapi.h>
#include <crypto/hash.h>
+#include <crypto/utils.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/slab.h>
diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 01005035ad10..56f9282ec5df 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -13,8 +13,8 @@
#define pr_fmt(fmt) "IPv6: " fmt
-#include <crypto/algapi.h>
#include <crypto/hash.h>
+#include <crypto/utils.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <net/ip.h>
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 6/12] wifi: mac80211: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (4 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 5/12] ah: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-23 10:34 ` Johannes Berg
2023-08-23 10:32 ` [PATCH 7/12] mptcp: " Herbert Xu
` (5 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
net/mac80211/fils_aead.c | 2 +-
net/mac80211/key.c | 2 +-
net/mac80211/wpa.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/mac80211/fils_aead.c b/net/mac80211/fils_aead.c
index e1d4cfd99128..912c46f74d24 100644
--- a/net/mac80211/fils_aead.c
+++ b/net/mac80211/fils_aead.c
@@ -5,9 +5,9 @@
*/
#include <crypto/aes.h>
-#include <crypto/algapi.h>
#include <crypto/hash.h>
#include <crypto/skcipher.h>
+#include <crypto/utils.h>
#include "ieee80211_i.h"
#include "aes_cmac.h"
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 21cf5a208910..13050dc9321f 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -9,6 +9,7 @@
* Copyright 2018-2020, 2022-2023 Intel Corporation
*/
+#include <crypto/utils.h>
#include <linux/if_ether.h>
#include <linux/etherdevice.h>
#include <linux/list.h>
@@ -17,7 +18,6 @@
#include <linux/slab.h>
#include <linux/export.h>
#include <net/mac80211.h>
-#include <crypto/algapi.h>
#include <asm/unaligned.h>
#include "ieee80211_i.h"
#include "driver-ops.h"
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index 4133496da378..2d8e38b3bcb5 100644
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -15,7 +15,7 @@
#include <asm/unaligned.h>
#include <net/mac80211.h>
#include <crypto/aes.h>
-#include <crypto/algapi.h>
+#include <crypto/utils.h>
#include "ieee80211_i.h"
#include "michael.h"
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 7/12] mptcp: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (5 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 6/12] wifi: mac80211: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-23 12:53 ` Matthieu Baerts
2023-08-23 10:32 ` [PATCH 8/12] SUNRPC: " Herbert Xu
` (4 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
net/mptcp/subflow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 9ee3b7abbaf6..64bb200099dc 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -9,8 +9,8 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/netdevice.h>
-#include <crypto/algapi.h>
#include <crypto/sha2.h>
+#include <crypto/utils.h>
#include <net/sock.h>
#include <net/inet_common.h>
#include <net/inet_hashtables.h>
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 8/12] SUNRPC: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (6 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 7/12] mptcp: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-23 13:44 ` Chuck Lever
2023-08-23 10:32 ` [PATCH 9/12] evm: " Herbert Xu
` (3 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 9734e1d9f991..d2b02710ab07 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -34,9 +34,9 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#include <crypto/algapi.h>
#include <crypto/hash.h>
#include <crypto/skcipher.h>
+#include <crypto/utils.h>
#include <linux/err.h>
#include <linux/types.h>
#include <linux/mm.h>
diff --git a/net/sunrpc/auth_gss/gss_krb5_unseal.c b/net/sunrpc/auth_gss/gss_krb5_unseal.c
index 7d6d4ae4a3c9..b3ca30544e70 100644
--- a/net/sunrpc/auth_gss/gss_krb5_unseal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_unseal.c
@@ -57,11 +57,9 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#include <crypto/algapi.h>
#include <linux/types.h>
#include <linux/jiffies.h>
#include <linux/sunrpc/gss_krb5.h>
-#include <linux/crypto.h>
#include "gss_krb5_internal.h"
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 9/12] evm: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (7 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 8/12] SUNRPC: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-24 23:57 ` Mimi Zohar
2023-08-23 10:32 ` [PATCH 10/12] KEYS: encrypted: " Herbert Xu
` (2 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
security/integrity/evm/evm_main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index c9b6e2a43478..e635a8d18dae 100644
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -14,7 +14,6 @@
#define pr_fmt(fmt) "EVM: "fmt
#include <linux/init.h>
-#include <linux/crypto.h>
#include <linux/audit.h>
#include <linux/xattr.h>
#include <linux/integrity.h>
@@ -24,7 +23,7 @@
#include <crypto/hash.h>
#include <crypto/hash_info.h>
-#include <crypto/algapi.h>
+#include <crypto/utils.h>
#include "evm.h"
int evm_initialized;
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 10/12] KEYS: encrypted: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (8 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 9/12] evm: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-24 23:57 ` Mimi Zohar
2023-08-23 10:32 ` [PATCH 11/12] wireguard: " Herbert Xu
2023-08-23 10:32 ` [PATCH 12/12] chelsio: " Herbert Xu
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
security/keys/encrypted-keys/encrypted.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index 1e313982af02..8af2136069d2 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -27,10 +27,10 @@
#include <linux/scatterlist.h>
#include <linux/ctype.h>
#include <crypto/aes.h>
-#include <crypto/algapi.h>
#include <crypto/hash.h>
#include <crypto/sha2.h>
#include <crypto/skcipher.h>
+#include <crypto/utils.h>
#include "encrypted.h"
#include "ecryptfs_format.h"
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 11/12] wireguard: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (9 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 10/12] KEYS: encrypted: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
2023-08-23 11:48 ` Jason A. Donenfeld
2023-08-23 10:32 ` [PATCH 12/12] chelsio: " Herbert Xu
11 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
drivers/net/wireguard/cookie.c | 2 +-
drivers/net/wireguard/netlink.c | 2 +-
drivers/net/wireguard/noise.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireguard/cookie.c b/drivers/net/wireguard/cookie.c
index 4956f0499c19..f89581b5e8cb 100644
--- a/drivers/net/wireguard/cookie.c
+++ b/drivers/net/wireguard/cookie.c
@@ -12,9 +12,9 @@
#include <crypto/blake2s.h>
#include <crypto/chacha20poly1305.h>
+#include <crypto/utils.h>
#include <net/ipv6.h>
-#include <crypto/algapi.h>
void wg_cookie_checker_init(struct cookie_checker *checker,
struct wg_device *wg)
diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c
index 6d1bd9f52d02..0a1502100e8b 100644
--- a/drivers/net/wireguard/netlink.c
+++ b/drivers/net/wireguard/netlink.c
@@ -12,10 +12,10 @@
#include <uapi/linux/wireguard.h>
+#include <crypto/utils.h>
#include <linux/if.h>
#include <net/genetlink.h>
#include <net/sock.h>
-#include <crypto/algapi.h>
static struct genl_family genl_family;
diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c
index 720952b92e78..e7ad81ca4a36 100644
--- a/drivers/net/wireguard/noise.c
+++ b/drivers/net/wireguard/noise.c
@@ -10,12 +10,12 @@
#include "queueing.h"
#include "peerlookup.h"
+#include <crypto/utils.h>
#include <linux/rcupdate.h>
#include <linux/slab.h>
#include <linux/bitmap.h>
#include <linux/scatterlist.h>
#include <linux/highmem.h>
-#include <crypto/algapi.h>
/* This implements Noise_IKpsk2:
*
^ permalink raw reply related [flat|nested] 29+ messages in thread
* [PATCH 12/12] chelsio: Do not include crypto/algapi.h
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
` (10 preceding siblings ...)
2023-08-23 10:32 ` [PATCH 11/12] wireguard: " Herbert Xu
@ 2023-08-23 10:32 ` Herbert Xu
11 siblings, 0 replies; 29+ messages in thread
From: Herbert Xu @ 2023-08-23 10:32 UTC (permalink / raw)
To: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Jeff Layton, Neil Brown, linux-nfs, Mimi Zohar, linux-inte
The header file crypto/algapi.h is for internal use only. Use the
header file crypto/utils.h instead.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 2 --
drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h | 1 -
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h | 1 -
3 files changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c
index 3731c93f8f95..c7338ac6a5bb 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c
+++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c
@@ -39,7 +39,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/crypto.h>
#include <linux/skbuff.h>
#include <linux/rtnetlink.h>
#include <linux/highmem.h>
@@ -49,7 +48,6 @@
#include <net/esp.h>
#include <net/xfrm.h>
#include <crypto/aes.h>
-#include <crypto/algapi.h>
#include <crypto/hash.h>
#include <crypto/sha1.h>
#include <crypto/sha2.h>
diff --git a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h
index 1d110d2edd64..0d42e7d15714 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h
+++ b/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h
@@ -4,7 +4,6 @@
#ifndef __CHCR_IPSEC_H__
#define __CHCR_IPSEC_H__
-#include <crypto/algapi.h>
#include "t4_hw.h"
#include "cxgb4.h"
#include "t4_msg.h"
diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h
index 68562a82d036..d6a51d75a66f 100644
--- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h
+++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h
@@ -7,7 +7,6 @@
#define __CHTLS_H__
#include <crypto/aes.h>
-#include <crypto/algapi.h>
#include <crypto/hash.h>
#include <crypto/sha1.h>
#include <crypto/sha2.h>
^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [PATCH 6/12] wifi: mac80211: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 6/12] wifi: mac80211: " Herbert Xu
@ 2023-08-23 10:34 ` Johannes Berg
2023-08-24 5:10 ` Herbert Xu
0 siblings, 1 reply; 29+ messages in thread
From: Johannes Berg @ 2023-08-23 10:34 UTC (permalink / raw)
To: Herbert Xu, Linux Crypto Mailing List, Eric Biggers,
Theodore Y.Ts'o, Jaegeuk Kim, linux-fscrypt,
Richard Weinberger, linux-mtd, Marcel Holtmann, Johan Hedberg,
Luiz Augusto von Dentz, linux-bluetooth, Ilya Dryomov, Xiubo Li,
Jeff Layton, ceph-devel, Steffen Klassert, David S. Miller,
netdev, linux-wireless, Matthieu Baerts, Mat Martineau,
Chuck Lever, Neil Brown, linux-nfs, Mimi Zohar, linux-integrity,
Jason A.Donenfeld, Ayush Sawal
On Wed, 2023-08-23 at 18:32 +0800, Herbert Xu wrote:
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
No objection, of course, but I don't think it's necessarily clear that
it "is for internal use only", it literally says:
* Cryptographic API for algorithms (i.e., low-level API).
which really isn't the same as "don't use this file".
Might want to clarify that, or even move it into crypto/ from
include/crypto/ or something?
johannes
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 11/12] wireguard: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 11/12] wireguard: " Herbert Xu
@ 2023-08-23 11:48 ` Jason A. Donenfeld
0 siblings, 0 replies; 29+ messages in thread
From: Jason A. Donenfeld @ 2023-08-23 11:48 UTC (permalink / raw)
To: herbert
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Neil Brown, linux-nfs, Mimi Zohar, linux-integrity, Ayush Sawal
On Wed, Aug 23, 2023 at 12:33 PM Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> ---
>
> drivers/net/wireguard/cookie.c | 2 +-
> drivers/net/wireguard/netlink.c | 2 +-
> drivers/net/wireguard/noise.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireguard/cookie.c b/drivers/net/wireguard/cookie.c
> index 4956f0499c19..f89581b5e8cb 100644
> --- a/drivers/net/wireguard/cookie.c
> +++ b/drivers/net/wireguard/cookie.c
> @@ -12,9 +12,9 @@
>
> #include <crypto/blake2s.h>
> #include <crypto/chacha20poly1305.h>
> +#include <crypto/utils.h>
>
> #include <net/ipv6.h>
> -#include <crypto/algapi.h>
>
> void wg_cookie_checker_init(struct cookie_checker *checker,
> struct wg_device *wg)
> diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c
> index 6d1bd9f52d02..0a1502100e8b 100644
> --- a/drivers/net/wireguard/netlink.c
> +++ b/drivers/net/wireguard/netlink.c
> @@ -12,10 +12,10 @@
>
> #include <uapi/linux/wireguard.h>
>
> +#include <crypto/utils.h>
> #include <linux/if.h>
> #include <net/genetlink.h>
> #include <net/sock.h>
> -#include <crypto/algapi.h>
>
> static struct genl_family genl_family;
>
> diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c
> index 720952b92e78..e7ad81ca4a36 100644
> --- a/drivers/net/wireguard/noise.c
> +++ b/drivers/net/wireguard/noise.c
> @@ -10,12 +10,12 @@
> #include "queueing.h"
> #include "peerlookup.h"
>
> +#include <crypto/utils.h>
> #include <linux/rcupdate.h>
> #include <linux/slab.h>
> #include <linux/bitmap.h>
> #include <linux/scatterlist.h>
> #include <linux/highmem.h>
> -#include <crypto/algapi.h>
>
> /* This implements Noise_IKpsk2:
> *
Small nit - with the exception of the cookie.c reordering, could you
maintain the existing #include ordering of the other files? No need to
send a v2 for that if you don't want. And please make the entire
commit subject lowercase. With those done,
Acked-by: Jason A. Donenfeld <Jason@zx2c4.com>
As a side note, you may want to eventually do something to make sure
people don't add back algapi.h, like move it to internal/ or out of
include/ all together. I figure you've already thought about this, and
this series is just the first step.
Jason
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 7/12] mptcp: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 7/12] mptcp: " Herbert Xu
@ 2023-08-23 12:53 ` Matthieu Baerts
0 siblings, 0 replies; 29+ messages in thread
From: Matthieu Baerts @ 2023-08-23 12:53 UTC (permalink / raw)
To: Herbert Xu, Linux Crypto Mailing List, Eric Biggers,
Theodore Y. Ts'o, Jaegeuk Kim, linux-fscrypt,
Richard Weinberger, linux-mtd, Marcel Holtmann, Johan Hedberg,
Luiz Augusto von Dentz, linux-bluetooth, Ilya Dryomov, Xiubo Li,
Jeff Layton, ceph-devel, Steffen Klassert, David S. Miller,
netdev, Johannes Berg, linux-wireless, Mat Martineau,
Chuck Lever, Neil Brown, linux-nfs, Mimi Zohar, linux-integrity,
Jason A. Donenfeld, Ayush Sawal
Hello,
On 23/08/2023 12:32, Herbert Xu wrote:
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
Thank you for the patch! It looks good to me:
Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
I understood that other patches will come later to make it clear
crypto/algapi.h is for internal use only so that's good!
> diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
> index 9ee3b7abbaf6..64bb200099dc 100644
> --- a/net/mptcp/subflow.c
> +++ b/net/mptcp/subflow.c
> @@ -9,8 +9,8 @@
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/netdevice.h>
> -#include <crypto/algapi.h>
> #include <crypto/sha2.h>
> +#include <crypto/utils.h>
It is fine for me if you carry this patch in your tree: this part here
has not changed for a while and there is no ongoing work going to modify
it. So there should not be any conflicts when merging the different
trees later.
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 8/12] SUNRPC: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 8/12] SUNRPC: " Herbert Xu
@ 2023-08-23 13:44 ` Chuck Lever
0 siblings, 0 replies; 29+ messages in thread
From: Chuck Lever @ 2023-08-23 13:44 UTC (permalink / raw)
To: Herbert Xu
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Neil Brown,
linux-nfs, Mimi Zohar, linux-integrity, Jason A. Donenfeld,
Ayush Sawal
On Wed, Aug 23, 2023 at 06:32:30PM +0800, Herbert Xu wrote:
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>
> net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +-
> net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
> index 9734e1d9f991..d2b02710ab07 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
> @@ -34,9 +34,9 @@
> * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
> */
>
> -#include <crypto/algapi.h>
> #include <crypto/hash.h>
> #include <crypto/skcipher.h>
> +#include <crypto/utils.h>
> #include <linux/err.h>
> #include <linux/types.h>
> #include <linux/mm.h>
> diff --git a/net/sunrpc/auth_gss/gss_krb5_unseal.c b/net/sunrpc/auth_gss/gss_krb5_unseal.c
> index 7d6d4ae4a3c9..b3ca30544e70 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_unseal.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_unseal.c
> @@ -57,11 +57,9 @@
> * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
> */
>
> -#include <crypto/algapi.h>
> #include <linux/types.h>
> #include <linux/jiffies.h>
> #include <linux/sunrpc/gss_krb5.h>
> -#include <linux/crypto.h>
>
> #include "gss_krb5_internal.h"
>
--
Chuck Lever
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 4/12] ceph: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 4/12] ceph: " Herbert Xu
@ 2023-08-23 20:53 ` Ilya Dryomov
0 siblings, 0 replies; 29+ messages in thread
From: Ilya Dryomov @ 2023-08-23 20:53 UTC (permalink / raw)
To: Herbert Xu
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Neil Brown, linux-nfs, Mimi Zohar, linux-integrity,
Jason A. Donenfeld, Ayush Sawal
On Wed, Aug 23, 2023 at 12:32 PM Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> ---
>
> net/ceph/messenger_v2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c
> index 1a888b86a494..4aab32144833 100644
> --- a/net/ceph/messenger_v2.c
> +++ b/net/ceph/messenger_v2.c
> @@ -8,9 +8,9 @@
> #include <linux/ceph/ceph_debug.h>
>
> #include <crypto/aead.h>
> -#include <crypto/algapi.h> /* for crypto_memneq() */
> #include <crypto/hash.h>
> #include <crypto/sha2.h>
> +#include <crypto/utils.h>
> #include <linux/bvec.h>
> #include <linux/crc32c.h>
> #include <linux/net.h>
Applied.
Thanks,
Ilya
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 6/12] wifi: mac80211: Do not include crypto/algapi.h
2023-08-23 10:34 ` Johannes Berg
@ 2023-08-24 5:10 ` Herbert Xu
2023-08-24 6:59 ` Johannes Berg
0 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-24 5:10 UTC (permalink / raw)
To: Johannes Berg
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y.Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, linux-wireless,
Matthieu Baerts, Mat Martineau, Chuck Lever, Neil Brown,
linux-nfs, Mimi Zohar, linux-integrity, Jason A.Donenfeld,
Ayush Sawal
On Wed, Aug 23, 2023 at 12:34:35PM +0200, Johannes Berg wrote:
>
> No objection, of course, but I don't think it's necessarily clear that
> it "is for internal use only", it literally says:
>
> * Cryptographic API for algorithms (i.e., low-level API).
>
> which really isn't the same as "don't use this file".
>
> Might want to clarify that, or even move it into crypto/ from
> include/crypto/ or something?
Yes it should be in include/crypto/internal. Once the churn gets
small enough I'll move it there.
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 6/12] wifi: mac80211: Do not include crypto/algapi.h
2023-08-24 5:10 ` Herbert Xu
@ 2023-08-24 6:59 ` Johannes Berg
2023-08-24 8:45 ` Herbert Xu
0 siblings, 1 reply; 29+ messages in thread
From: Johannes Berg @ 2023-08-24 6:59 UTC (permalink / raw)
To: Herbert Xu
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y.Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, linux-wireless,
Matthieu Baerts, Mat Martineau, Chuck Lever, Neil Brown,
linux-nfs, Mimi Zohar, linux-integrity, Jason A.Donenfeld,
Ayush Sawal
On Thu, 2023-08-24 at 13:10 +0800, Herbert Xu wrote:
> On Wed, Aug 23, 2023 at 12:34:35PM +0200, Johannes Berg wrote:
> >
> > No objection, of course, but I don't think it's necessarily clear that
> > it "is for internal use only", it literally says:
> >
> > * Cryptographic API for algorithms (i.e., low-level API).
> >
> > which really isn't the same as "don't use this file".
> >
> > Might want to clarify that, or even move it into crypto/ from
> > include/crypto/ or something?
>
> Yes it should be in include/crypto/internal. Once the churn gets
> small enough I'll move it there.
>
Sounds good :)
I was kind of waiting to see - but now that others have applied some
patches to their tree I've done the same.
johannes
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 6/12] wifi: mac80211: Do not include crypto/algapi.h
2023-08-24 6:59 ` Johannes Berg
@ 2023-08-24 8:45 ` Herbert Xu
0 siblings, 0 replies; 29+ messages in thread
From: Herbert Xu @ 2023-08-24 8:45 UTC (permalink / raw)
To: Johannes Berg
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y.Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, linux-wireless,
Matthieu Baerts, Mat Martineau, Chuck Lever, Neil Brown,
linux-nfs, Mimi Zohar, linux-integrity, Jason A.Donenfeld,
Ayush Sawal
On Thu, Aug 24, 2023 at 08:59:08AM +0200, Johannes Berg wrote:
>
> I was kind of waiting to see - but now that others have applied some
> patches to their tree I've done the same.
Noted. Thanks!
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 9/12] evm: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 9/12] evm: " Herbert Xu
@ 2023-08-24 23:57 ` Mimi Zohar
0 siblings, 0 replies; 29+ messages in thread
From: Mimi Zohar @ 2023-08-24 23:57 UTC (permalink / raw)
To: Herbert Xu, Linux Crypto Mailing List, Eric Biggers,
Theodore Y. Ts'o, Jaegeuk Kim, linux-fscrypt,
Richard Weinberger, linux-mtd, Marcel Holtmann, Johan Hedberg,
Luiz Augusto von Dentz, linux-bluetooth, Ilya Dryomov, Xiubo Li,
Jeff Layton, ceph-devel, Steffen Klassert, David S. Miller,
netdev, Johannes Berg, linux-wireless, Matthieu Baerts,
Mat Martineau, Chuck Lever, Neil Brown, linux-nfs,
linux-integrity, Jason A. Donenfeld, Ayush Sawal
On Wed, 2023-08-23 at 18:32 +0800, Herbert Xu wrote:
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Mimi Zohar <zohar@linux.ibm.com>
> ---
>
> security/integrity/evm/evm_main.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
> index c9b6e2a43478..e635a8d18dae 100644
> --- a/security/integrity/evm/evm_main.c
> +++ b/security/integrity/evm/evm_main.c
> @@ -14,7 +14,6 @@
> #define pr_fmt(fmt) "EVM: "fmt
>
> #include <linux/init.h>
> -#include <linux/crypto.h>
> #include <linux/audit.h>
> #include <linux/xattr.h>
> #include <linux/integrity.h>
> @@ -24,7 +23,7 @@
>
> #include <crypto/hash.h>
> #include <crypto/hash_info.h>
> -#include <crypto/algapi.h>
> +#include <crypto/utils.h>
> #include "evm.h"
>
> int evm_initialized;
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 10/12] KEYS: encrypted: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 10/12] KEYS: encrypted: " Herbert Xu
@ 2023-08-24 23:57 ` Mimi Zohar
0 siblings, 0 replies; 29+ messages in thread
From: Mimi Zohar @ 2023-08-24 23:57 UTC (permalink / raw)
To: Herbert Xu, Linux Crypto Mailing List, Eric Biggers,
Theodore Y. Ts'o, Jaegeuk Kim, linux-fscrypt,
Richard Weinberger, linux-mtd, Marcel Holtmann, Johan Hedberg,
Luiz Augusto von Dentz, linux-bluetooth, Ilya Dryomov, Xiubo Li,
Jeff Layton, ceph-devel, Steffen Klassert, David S. Miller,
netdev, Johannes Berg, linux-wireless, Matthieu Baerts,
Mat Martineau, Chuck Lever, Neil Brown, linux-nfs,
linux-integrity, Jason A. Donenfeld, Ayush Sawal
On Wed, 2023-08-23 at 18:32 +0800, Herbert Xu wrote:
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Mimi Zohar <zohar@linux.ibm.com>
> ---
>
> security/keys/encrypted-keys/encrypted.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
> index 1e313982af02..8af2136069d2 100644
> --- a/security/keys/encrypted-keys/encrypted.c
> +++ b/security/keys/encrypted-keys/encrypted.c
> @@ -27,10 +27,10 @@
> #include <linux/scatterlist.h>
> #include <linux/ctype.h>
> #include <crypto/aes.h>
> -#include <crypto/algapi.h>
> #include <crypto/hash.h>
> #include <crypto/sha2.h>
> #include <crypto/skcipher.h>
> +#include <crypto/utils.h>
>
> #include "encrypted.h"
> #include "ecryptfs_format.h"
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 1/12] fscrypt: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 1/12] fscrypt: " Herbert Xu
@ 2023-08-25 21:13 ` Eric Biggers
0 siblings, 0 replies; 29+ messages in thread
From: Eric Biggers @ 2023-08-25 21:13 UTC (permalink / raw)
To: Herbert Xu
Cc: Linux Crypto Mailing List, Theodore Y. Ts'o, Jaegeuk Kim,
linux-fscrypt, Richard Weinberger, linux-mtd, Marcel Holtmann,
Johan Hedberg, Luiz Augusto von Dentz, linux-bluetooth,
Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, netdev, Johannes Berg,
linux-wireless, Matthieu Baerts, Mat Martineau, Chuck Lever,
Neil Brown, linux-nfs, Mimi Zohar, linux-integrity,
Jason A. Donenfeld, Ayush Sawal
On Wed, Aug 23, 2023 at 06:32:15PM +0800, Herbert Xu wrote:
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> ---
>
> fs/crypto/keysetup_v1.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/crypto/keysetup_v1.c b/fs/crypto/keysetup_v1.c
> index 75dabd9b27f9..d698ecb9ad44 100644
> --- a/fs/crypto/keysetup_v1.c
> +++ b/fs/crypto/keysetup_v1.c
> @@ -20,8 +20,8 @@
> * managed alongside the master keys in the filesystem-level keyring)
> */
>
> -#include <crypto/algapi.h>
> #include <crypto/skcipher.h>
> +#include <crypto/utils.h>
> #include <keys/user-type.h>
> #include <linux/hashtable.h>
> #include <linux/scatterlist.h>
Acked-by: Eric Biggers <ebiggers@google.com>
- Eric
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 3/12] Bluetooth: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 3/12] Bluetooth: " Herbert Xu
@ 2023-08-25 21:23 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 29+ messages in thread
From: Luiz Augusto von Dentz @ 2023-08-25 21:23 UTC (permalink / raw)
To: Herbert Xu
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y. Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, linux-bluetooth, Ilya Dryomov,
Xiubo Li, Jeff Layton, ceph-devel, Steffen Klassert,
David S. Miller, netdev, Johannes Berg, linux-wireless,
Matthieu Baerts, Mat Martineau, Chuck Lever, Neil Brown,
linux-nfs, Mimi Zohar, linux-integrity, Jason A. Donenfeld,
Ayush Sawal
Hi Herbert,
On Wed, Aug 23, 2023 at 3:32 AM Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> ---
>
> net/bluetooth/smp.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
> index f1a9fc0012f0..5f2f97de295e 100644
> --- a/net/bluetooth/smp.c
> +++ b/net/bluetooth/smp.c
> @@ -22,11 +22,10 @@
>
> #include <linux/debugfs.h>
> #include <linux/scatterlist.h>
> -#include <linux/crypto.h>
> #include <crypto/aes.h>
> -#include <crypto/algapi.h>
> #include <crypto/hash.h>
> #include <crypto/kpp.h>
> +#include <crypto/utils.h>
>
> #include <net/bluetooth/bluetooth.h>
> #include <net/bluetooth/hci_core.h>
Acked-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 2/12] ubifs: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 2/12] ubifs: " Herbert Xu
@ 2023-08-26 6:58 ` kernel test robot
2023-08-26 8:36 ` [PATCH] KEYS: Include linux/errno.h in linux/verification.h Herbert Xu
2023-08-27 1:40 ` [PATCH 2/12] ubifs: Do not include crypto/algapi.h kernel test robot
1 sibling, 1 reply; 29+ messages in thread
From: kernel test robot @ 2023-08-26 6:58 UTC (permalink / raw)
To: Herbert Xu, Linux Crypto Mailing List, Eric Biggers,
Theodore Y.Ts'o, Jaegeuk Kim, linux-fscrypt,
Richard Weinberger, linux-mtd, Marcel Holtmann, Johan Hedberg,
Luiz Augusto von Dentz, linux-bluetooth, Ilya Dryomov, Xiubo Li,
Jeff Layton, ceph-devel, Steffen Klassert, David S. Miller,
Johannes Berg, linux-wireless, Matthieu Baerts, Mat Martineau,
Chuck Lever, Neil Brown, linux-nfs, Mimi Zohar, linux-inte,
grity, Jason A.Donenfeld, Ayush Sawal
Cc: llvm, oe-kbuild-all, netdev
Hi Herbert,
kernel test robot noticed the following build errors:
[auto build test ERROR on wireless-next/main]
[also build test ERROR on wireless/main linus/master rw-ubifs/next rw-ubifs/fixes v6.5-rc7 next-20230825]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Herbert-Xu/fscrypt-Do-not-include-crypto-algapi-h/20230823-183716
base: https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git main
patch link: https://lore.kernel.org/r/E1qYl9s-006vDm-IW%40formenos.hmeau.com
patch subject: [PATCH 2/12] ubifs: Do not include crypto/algapi.h
config: x86_64-randconfig-075-20230823 (https://download.01.org/0day-ci/archive/20230826/202308261414.HKw1Mrip-lkp@intel.com/config)
compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07)
reproduce: (https://download.01.org/0day-ci/archive/20230826/202308261414.HKw1Mrip-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202308261414.HKw1Mrip-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from fs/ubifs/auth.c:12:
>> include/linux/verification.h:23:11: error: use of undeclared identifier 'EINVAL'
return -EINVAL;
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
In file included from include/linux/fs.h:33:
In file included from include/linux/percpu-rwsem.h:7:
In file included from include/linux/rcuwait.h:6:
In file included from include/linux/sched/signal.h:6:
include/linux/signal.h:97:11: warning: array index 3 is past the end of the array (that has type 'unsigned long[1]') [-Warray-bounds]
return (set->sig[3] | set->sig[2] |
^ ~
arch/x86/include/asm/signal.h:24:2: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
In file included from include/linux/fs.h:33:
In file included from include/linux/percpu-rwsem.h:7:
In file included from include/linux/rcuwait.h:6:
In file included from include/linux/sched/signal.h:6:
include/linux/signal.h:97:25: warning: array index 2 is past the end of the array (that has type 'unsigned long[1]') [-Warray-bounds]
return (set->sig[3] | set->sig[2] |
^ ~
arch/x86/include/asm/signal.h:24:2: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
In file included from include/linux/fs.h:33:
In file included from include/linux/percpu-rwsem.h:7:
In file included from include/linux/rcuwait.h:6:
In file included from include/linux/sched/signal.h:6:
include/linux/signal.h:98:4: warning: array index 1 is past the end of the array (that has type 'unsigned long[1]') [-Warray-bounds]
set->sig[1] | set->sig[0]) == 0;
^ ~
arch/x86/include/asm/signal.h:24:2: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
In file included from include/linux/fs.h:33:
In file included from include/linux/percpu-rwsem.h:7:
In file included from include/linux/rcuwait.h:6:
In file included from include/linux/sched/signal.h:6:
include/linux/signal.h:100:11: warning: array index 1 is past the end of the array (that has type 'unsigned long[1]') [-Warray-bounds]
return (set->sig[1] | set->sig[0]) == 0;
^ ~
arch/x86/include/asm/signal.h:24:2: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
In file included from include/linux/fs.h:33:
In file included from include/linux/percpu-rwsem.h:7:
In file included from include/linux/rcuwait.h:6:
In file included from include/linux/sched/signal.h:6:
include/linux/signal.h:113:11: warning: array index 3 is past the end of the array (that has type 'const unsigned long[1]') [-Warray-bounds]
return (set1->sig[3] == set2->sig[3]) &&
^ ~
arch/x86/include/asm/signal.h:24:2: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
In file included from include/linux/fs.h:33:
In file included from include/linux/percpu-rwsem.h:7:
In file included from include/linux/rcuwait.h:6:
In file included from include/linux/sched/signal.h:6:
include/linux/signal.h:113:27: warning: array index 3 is past the end of the array (that has type 'const unsigned long[1]') [-Warray-bounds]
return (set1->sig[3] == set2->sig[3]) &&
^ ~
arch/x86/include/asm/signal.h:24:2: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
In file included from include/linux/fs.h:33:
In file included from include/linux/percpu-rwsem.h:7:
In file included from include/linux/rcuwait.h:6:
In file included from include/linux/sched/signal.h:6:
include/linux/signal.h:114:5: warning: array index 2 is past the end of the array (that has type 'const unsigned long[1]') [-Warray-bounds]
(set1->sig[2] == set2->sig[2]) &&
^ ~
arch/x86/include/asm/signal.h:24:2: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
In file included from include/linux/fs.h:33:
In file included from include/linux/percpu-rwsem.h:7:
In file included from include/linux/rcuwait.h:6:
In file included from include/linux/sched/signal.h:6:
include/linux/signal.h:114:21: warning: array index 2 is past the end of the array (that has type 'const unsigned long[1]') [-Warray-bounds]
(set1->sig[2] == set2->sig[2]) &&
^ ~
arch/x86/include/asm/signal.h:24:2: note: array 'sig' declared here
unsigned long sig[_NSIG_WORDS];
^
In file included from fs/ubifs/auth.c:18:
In file included from fs/ubifs/ubifs.h:16:
vim +/EINVAL +23 include/linux/verification.h
817aef260037f3 Yannik Sembritzki 2018-08-16 19
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 20 static inline int system_keyring_id_check(u64 id)
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 21 {
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 22 if (id > (unsigned long)VERIFY_USE_PLATFORM_KEYRING)
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 @23 return -EINVAL;
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 24
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 25 return 0;
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 26 }
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 27
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH] KEYS: Include linux/errno.h in linux/verification.h
2023-08-26 6:58 ` kernel test robot
@ 2023-08-26 8:36 ` Herbert Xu
2023-08-28 9:33 ` Daniel Borkmann
0 siblings, 1 reply; 29+ messages in thread
From: Herbert Xu @ 2023-08-26 8:36 UTC (permalink / raw)
To: kernel test robot
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y.Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, Johannes Berg, linux-wireless,
Matthieu Baerts, Mat Martineau, Chuck Lever, Neil Brown,
linux-nfs, Mimi Zohar, linux-inte, grity, Jason A.Donenfeld,
Ayush Sawal, llvm, oe-kbuild-all, netdev, David Howells,
keyrings
On Sat, Aug 26, 2023 at 02:58:48PM +0800, kernel test robot wrote:
>
> All errors (new ones prefixed by >>):
>
> In file included from fs/ubifs/auth.c:12:
> >> include/linux/verification.h:23:11: error: use of undeclared identifier 'EINVAL'
---8<---
Add inclusion of linux/errno.h as otherwise the reference to EINVAL
may be invalid.
Fixes: f3cf4134c5c6 ("bpf: Add bpf_lookup_*_key() and bpf_key_put() kfuncs")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202308261414.HKw1Mrip-lkp@intel.com/
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/include/linux/verification.h b/include/linux/verification.h
index f34e50ebcf60..cb2d47f28091 100644
--- a/include/linux/verification.h
+++ b/include/linux/verification.h
@@ -8,6 +8,7 @@
#ifndef _LINUX_VERIFICATION_H
#define _LINUX_VERIFICATION_H
+#include <linux/errno.h>
#include <linux/types.h>
/*
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply related [flat|nested] 29+ messages in thread
* Re: [PATCH 2/12] ubifs: Do not include crypto/algapi.h
2023-08-23 10:32 ` [PATCH 2/12] ubifs: " Herbert Xu
2023-08-26 6:58 ` kernel test robot
@ 2023-08-27 1:40 ` kernel test robot
1 sibling, 0 replies; 29+ messages in thread
From: kernel test robot @ 2023-08-27 1:40 UTC (permalink / raw)
To: Herbert Xu, Linux Crypto Mailing List, Eric Biggers,
Theodore Y.Ts'o, Jaegeuk Kim, linux-fscrypt,
Richard Weinberger, linux-mtd, Marcel Holtmann, Johan Hedberg,
Luiz Augusto von Dentz, linux-bluetooth, Ilya Dryomov, Xiubo Li,
Jeff Layton, ceph-devel, Steffen Klassert, David S. Miller,
Johannes Berg, linux-wireless, Matthieu Baerts, Mat Martineau,
Chuck Lever, Neil Brown, linux-nfs, Mimi Zohar, linux-inte,
grity, Jason A.Donenfeld, Ayush Sawal
Cc: oe-kbuild-all, netdev
Hi Herbert,
kernel test robot noticed the following build errors:
[auto build test ERROR on wireless-next/main]
[also build test ERROR on wireless/main linus/master rw-ubifs/next rw-ubifs/fixes v6.5-rc7 next-20230825]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Herbert-Xu/fscrypt-Do-not-include-crypto-algapi-h/20230823-183716
base: https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git main
patch link: https://lore.kernel.org/r/E1qYl9s-006vDm-IW%40formenos.hmeau.com
patch subject: [PATCH 2/12] ubifs: Do not include crypto/algapi.h
config: x86_64-randconfig-r016-20230823 (https://download.01.org/0day-ci/archive/20230827/202308270908.Go1QPOZ7-lkp@intel.com/config)
compiler: gcc-7 (Ubuntu 7.5.0-6ubuntu2) 7.5.0
reproduce: (https://download.01.org/0day-ci/archive/20230827/202308270908.Go1QPOZ7-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202308270908.Go1QPOZ7-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from fs/ubifs/auth.c:12:0:
include/linux/verification.h: In function 'system_keyring_id_check':
>> include/linux/verification.h:23:11: error: 'EINVAL' undeclared (first use in this function)
return -EINVAL;
^~~~~~
include/linux/verification.h:23:11: note: each undeclared identifier is reported only once for each function it appears in
vim +/EINVAL +23 include/linux/verification.h
817aef260037f3 Yannik Sembritzki 2018-08-16 19
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 20 static inline int system_keyring_id_check(u64 id)
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 21 {
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 22 if (id > (unsigned long)VERIFY_USE_PLATFORM_KEYRING)
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 @23 return -EINVAL;
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 24
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 25 return 0;
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 26 }
f3cf4134c5c6c4 Roberto Sassu 2022-09-20 27
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH] KEYS: Include linux/errno.h in linux/verification.h
2023-08-26 8:36 ` [PATCH] KEYS: Include linux/errno.h in linux/verification.h Herbert Xu
@ 2023-08-28 9:33 ` Daniel Borkmann
0 siblings, 0 replies; 29+ messages in thread
From: Daniel Borkmann @ 2023-08-28 9:33 UTC (permalink / raw)
To: Herbert Xu, kernel test robot
Cc: Linux Crypto Mailing List, Eric Biggers, Theodore Y.Ts'o,
Jaegeuk Kim, linux-fscrypt, Richard Weinberger, linux-mtd,
Marcel Holtmann, Johan Hedberg, Luiz Augusto von Dentz,
linux-bluetooth, Ilya Dryomov, Xiubo Li, Jeff Layton, ceph-devel,
Steffen Klassert, David S. Miller, Johannes Berg, linux-wireless,
Matthieu Baerts, Mat Martineau, Chuck Lever, Neil Brown,
linux-nfs, Mimi Zohar, linux-inte, grity, Jason A.Donenfeld,
Ayush Sawal, llvm, oe-kbuild-all, netdev, David Howells,
keyrings
Hi Herbert,
On 8/26/23 10:36 AM, Herbert Xu wrote:
> On Sat, Aug 26, 2023 at 02:58:48PM +0800, kernel test robot wrote:
>>
>> All errors (new ones prefixed by >>):
>>
>> In file included from fs/ubifs/auth.c:12:
>>>> include/linux/verification.h:23:11: error: use of undeclared identifier 'EINVAL'
>
> ---8<---
> Add inclusion of linux/errno.h as otherwise the reference to EINVAL
> may be invalid.
>
> Fixes: f3cf4134c5c6 ("bpf: Add bpf_lookup_*_key() and bpf_key_put() kfuncs")
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202308261414.HKw1Mrip-lkp@intel.com/
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>
> diff --git a/include/linux/verification.h b/include/linux/verification.h
> index f34e50ebcf60..cb2d47f28091 100644
> --- a/include/linux/verification.h
> +++ b/include/linux/verification.h
> @@ -8,6 +8,7 @@
> #ifndef _LINUX_VERIFICATION_H
> #define _LINUX_VERIFICATION_H
>
> +#include <linux/errno.h>
> #include <linux/types.h>
>
> /*
>
Looks good, do you plan to route this fix to Linus?
Thanks,
Daniel
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2023-08-28 9:33 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-23 10:30 [PATCH 0/12] Do not include crypto/algapi.h Herbert Xu
2023-08-23 10:32 ` [PATCH 1/12] fscrypt: " Herbert Xu
2023-08-25 21:13 ` Eric Biggers
2023-08-23 10:32 ` [PATCH 2/12] ubifs: " Herbert Xu
2023-08-26 6:58 ` kernel test robot
2023-08-26 8:36 ` [PATCH] KEYS: Include linux/errno.h in linux/verification.h Herbert Xu
2023-08-28 9:33 ` Daniel Borkmann
2023-08-27 1:40 ` [PATCH 2/12] ubifs: Do not include crypto/algapi.h kernel test robot
2023-08-23 10:32 ` [PATCH 3/12] Bluetooth: " Herbert Xu
2023-08-25 21:23 ` Luiz Augusto von Dentz
2023-08-23 10:32 ` [PATCH 4/12] ceph: " Herbert Xu
2023-08-23 20:53 ` Ilya Dryomov
2023-08-23 10:32 ` [PATCH 5/12] ah: " Herbert Xu
2023-08-23 10:32 ` [PATCH 6/12] wifi: mac80211: " Herbert Xu
2023-08-23 10:34 ` Johannes Berg
2023-08-24 5:10 ` Herbert Xu
2023-08-24 6:59 ` Johannes Berg
2023-08-24 8:45 ` Herbert Xu
2023-08-23 10:32 ` [PATCH 7/12] mptcp: " Herbert Xu
2023-08-23 12:53 ` Matthieu Baerts
2023-08-23 10:32 ` [PATCH 8/12] SUNRPC: " Herbert Xu
2023-08-23 13:44 ` Chuck Lever
2023-08-23 10:32 ` [PATCH 9/12] evm: " Herbert Xu
2023-08-24 23:57 ` Mimi Zohar
2023-08-23 10:32 ` [PATCH 10/12] KEYS: encrypted: " Herbert Xu
2023-08-24 23:57 ` Mimi Zohar
2023-08-23 10:32 ` [PATCH 11/12] wireguard: " Herbert Xu
2023-08-23 11:48 ` Jason A. Donenfeld
2023-08-23 10:32 ` [PATCH 12/12] chelsio: " Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).