* [PATCH 06/18] security: keys: delete repeated words in comments
2020-12-09 12:14 [PATCH 00/18] keys: Miscellaneous fixes David Howells
@ 2020-12-09 12:15 ` David Howells
2020-12-09 19:12 ` [PATCH 00/18] keys: Miscellaneous fixes Ben Boeckel
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: David Howells @ 2020-12-09 12:15 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: Randy Dunlap, keyrings, James Morris, Serge E. Hallyn,
linux-security-module, dhowells, keyrings, linux-kernel
From: Randy Dunlap <rdunlap@infradead.org>
Drop repeated words in comments.
{to, will, the}
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: keyrings@vger.kernel.org
Cc: James Morris <jmorris@namei.org>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
Cc: linux-security-module@vger.kernel.org
---
security/keys/keyctl.c | 2 +-
security/keys/keyring.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 61a614c21b9b..96a92a645216 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -506,7 +506,7 @@ long keyctl_keyring_clear(key_serial_t ringid)
* keyring, otherwise replace the link to the matching key with a link to the
* new key.
*
- * The key must grant the caller Link permission and the the keyring must grant
+ * The key must grant the caller Link permission and the keyring must grant
* the caller Write permission. Furthermore, if an additional link is created,
* the keyring's quota will be extended.
*
diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index 977066208387..5e6a90760753 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -881,7 +881,7 @@ static bool search_nested_keyrings(struct key *keyring,
*
* Keys are matched to the type provided and are then filtered by the match
* function, which is given the description to use in any way it sees fit. The
- * match function may use any attributes of a key that it wishes to to
+ * match function may use any attributes of a key that it wishes to
* determine the match. Normally the match function from the key type would be
* used.
*
@@ -1204,7 +1204,7 @@ static int keyring_detect_cycle_iterator(const void *object,
}
/*
- * See if a cycle will will be created by inserting acyclic tree B in acyclic
+ * See if a cycle will be created by inserting acyclic tree B in acyclic
* tree A at the topmost level (ie: as a direct child of A).
*
* Since we are adding B to A at the top level, checking for cycles should just
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 00/18] keys: Miscellaneous fixes
2020-12-09 12:14 [PATCH 00/18] keys: Miscellaneous fixes David Howells
2020-12-09 12:15 ` [PATCH 06/18] security: keys: delete repeated words in comments David Howells
@ 2020-12-09 19:12 ` Ben Boeckel
2020-12-10 9:30 ` David Howells
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Ben Boeckel @ 2020-12-09 19:12 UTC (permalink / raw)
To: David Howells
Cc: Jarkko Sakkinen, Alexander A. Klimov, Petko Manolov,
Serge E. Hallyn, linux-kernel, YueHaibing, Herbert Xu, Jann Horn,
linux-crypto, Jarkko Sakkinen, Ben Boeckel, keyrings,
Gabriel Krisman Bertazi, linux-security-module, Randy Dunlap,
Mimi Zohar, Tom Rix, Gustavo A. R. Silva, Alex Shi,
Jarkko Sakkinen, Krzysztof Kozlowski, James Morris, Denis Efremov,
Mickaël Salaün, David Woodhouse, David S. Miller,
Tianjia Zhang
On Wed, Dec 09, 2020 at 12:14:24 +0000, David Howells wrote:
> I've extended my collection of minor keyrings fixes for the next merge
> window. Anything else I should add (or anything I should drop)?
>
> The patches can be found on the following branch:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=keys-fixes
1-16 LGTM (modulo the typo in patch 7's commit message). 17 and 18 are
outside my knowledge right now.
Reviewed-by: Ben Boeckel <mathstuf@gmail.com>
--Ben
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 00/18] keys: Miscellaneous fixes
2020-12-09 12:14 [PATCH 00/18] keys: Miscellaneous fixes David Howells
2020-12-09 12:15 ` [PATCH 06/18] security: keys: delete repeated words in comments David Howells
2020-12-09 19:12 ` [PATCH 00/18] keys: Miscellaneous fixes Ben Boeckel
@ 2020-12-10 9:30 ` David Howells
2020-12-11 8:17 ` Jarkko Sakkinen
2020-12-11 10:51 ` Jarkko Sakkinen
4 siblings, 0 replies; 7+ messages in thread
From: David Howells @ 2020-12-10 9:30 UTC (permalink / raw)
To: Ben Boeckel
Cc: Jarkko Sakkinen, linux-kernel, linux-crypto, keyrings,
linux-security-module
Ben Boeckel <me@benboeckel.net> wrote:
> > I've extended my collection of minor keyrings fixes for the next merge
> > window. Anything else I should add (or anything I should drop)?
> >
> > The patches can be found on the following branch:
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=keys-fixes
>
> 1-16 LGTM (modulo the typo in patch 7's commit message). 17 and 18 are
> outside my knowledge right now.
>
> Reviewed-by: Ben Boeckel <mathstuf@gmail.com>
I've applied that to the first 16 patches, thanks.
David
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 00/18] keys: Miscellaneous fixes
2020-12-09 12:14 [PATCH 00/18] keys: Miscellaneous fixes David Howells
` (2 preceding siblings ...)
2020-12-10 9:30 ` David Howells
@ 2020-12-11 8:17 ` Jarkko Sakkinen
2020-12-11 10:51 ` Jarkko Sakkinen
4 siblings, 0 replies; 7+ messages in thread
From: Jarkko Sakkinen @ 2020-12-11 8:17 UTC (permalink / raw)
To: David Howells
Cc: Jarkko Sakkinen, Alexander A. Klimov, Petko Manolov,
Serge E. Hallyn, linux-kernel, YueHaibing, Herbert Xu, Jann Horn,
linux-crypto, Jarkko Sakkinen, Ben Boeckel, keyrings,
Gabriel Krisman Bertazi, linux-security-module, Randy Dunlap,
Mimi Zohar, Tom Rix, Gustavo A. R. Silva, Alex Shi,
Krzysztof Kozlowski, James Morris, Denis Efremov,
Mickaël Salaün, David Woodhouse, David S. Miller,
Tianjia Zhang
On Wed, Dec 09, 2020 at 12:14:24PM +0000, David Howells wrote:
>
> Hi Jarkko,
>
> I've extended my collection of minor keyrings fixes for the next merge
> window. Anything else I should add (or anything I should drop)?
Looks good to me. I dropped the keys fixes that I had previously in
my tree that I saw in yours.
/Jarkko
>
> The patches can be found on the following branch:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=keys-fixes
>
> David
> ---
> Alex Shi (2):
> PKCS#7: drop function from kernel-doc pkcs7_validate_trust_one
> certs/blacklist: fix kernel doc interface issue
>
> Alexander A. Klimov (1):
> encrypted-keys: Replace HTTP links with HTTPS ones
>
> David Howells (1):
> certs: Fix blacklist flag type confusion
>
> Denis Efremov (1):
> security/keys: use kvfree_sensitive()
>
> Gabriel Krisman Bertazi (1):
> watch_queue: Drop references to /dev/watch_queue
>
> Gustavo A. R. Silva (1):
> security: keys: Fix fall-through warnings for Clang
>
> Jann Horn (1):
> keys: Remove outdated __user annotations
>
> Krzysztof Kozlowski (1):
> KEYS: asymmetric: Fix kerneldoc
>
> Mickaël Salaün (3):
> certs: Fix blacklisted hexadecimal hash string check
> PKCS#7: Fix missing include
> certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID
>
> Randy Dunlap (2):
> security: keys: delete repeated words in comments
> crypto: asymmetric_keys: fix some comments in pkcs7_parser.h
>
> Tianjia Zhang (1):
> crypto: public_key: Remove redundant header file from public_key.h
>
> Tom Rix (2):
> KEYS: remove redundant memset
> keys: remove trailing semicolon in macro definition
>
> YueHaibing (1):
> crypto: pkcs7: Use match_string() helper to simplify the code
>
>
> Documentation/security/keys/core.rst | 4 ++--
> certs/blacklist.c | 10 +++++-----
> certs/system_keyring.c | 5 +++--
> crypto/asymmetric_keys/asymmetric_type.c | 6 ++++--
> crypto/asymmetric_keys/pkcs7_parser.h | 5 ++---
> crypto/asymmetric_keys/pkcs7_trust.c | 2 +-
> crypto/asymmetric_keys/pkcs7_verify.c | 9 ++++-----
> include/crypto/public_key.h | 1 -
> include/keys/encrypted-type.h | 2 +-
> include/linux/key.h | 5 +++--
> include/linux/verification.h | 2 ++
> samples/Kconfig | 2 +-
> samples/watch_queue/watch_test.c | 2 +-
> security/integrity/ima/ima_mok.c | 3 +--
> security/keys/Kconfig | 8 ++++----
> security/keys/big_key.c | 9 +++------
> security/keys/key.c | 2 ++
> security/keys/keyctl.c | 2 +-
> security/keys/keyctl_pkey.c | 2 --
> security/keys/keyring.c | 10 +++++-----
> 20 files changed, 45 insertions(+), 46 deletions(-)
>
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 00/18] keys: Miscellaneous fixes
2020-12-09 12:14 [PATCH 00/18] keys: Miscellaneous fixes David Howells
` (3 preceding siblings ...)
2020-12-11 8:17 ` Jarkko Sakkinen
@ 2020-12-11 10:51 ` Jarkko Sakkinen
2020-12-11 10:56 ` Jarkko Sakkinen
4 siblings, 1 reply; 7+ messages in thread
From: Jarkko Sakkinen @ 2020-12-11 10:51 UTC (permalink / raw)
To: David Howells
Cc: Jarkko Sakkinen, Alexander A. Klimov, Petko Manolov,
Serge E. Hallyn, linux-kernel, YueHaibing, Herbert Xu, Jann Horn,
linux-crypto, Ben Boeckel, keyrings, Gabriel Krisman Bertazi,
linux-security-module, Randy Dunlap, Mimi Zohar, Tom Rix,
Gustavo A. R. Silva, Alex Shi, Jarkko Sakkinen,
Krzysztof Kozlowski, James Morris, Denis Efremov,
Mickaël Salaün, David Woodhouse, David S. Miller,
Tianjia Zhang
On Wed, Dec 09, 2020 at 12:14:24PM +0000, David Howells wrote:
>
> Hi Jarkko,
>
> I've extended my collection of minor keyrings fixes for the next merge
> window. Anything else I should add (or anything I should drop)?
>
> The patches can be found on the following branch:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=keys-fixes
>
> David
Looks good to me.
/Jarkko
> ---
> Alex Shi (2):
> PKCS#7: drop function from kernel-doc pkcs7_validate_trust_one
> certs/blacklist: fix kernel doc interface issue
>
> Alexander A. Klimov (1):
> encrypted-keys: Replace HTTP links with HTTPS ones
>
> David Howells (1):
> certs: Fix blacklist flag type confusion
>
> Denis Efremov (1):
> security/keys: use kvfree_sensitive()
>
> Gabriel Krisman Bertazi (1):
> watch_queue: Drop references to /dev/watch_queue
>
> Gustavo A. R. Silva (1):
> security: keys: Fix fall-through warnings for Clang
>
> Jann Horn (1):
> keys: Remove outdated __user annotations
>
> Krzysztof Kozlowski (1):
> KEYS: asymmetric: Fix kerneldoc
>
> Mickaël Salaün (3):
> certs: Fix blacklisted hexadecimal hash string check
> PKCS#7: Fix missing include
> certs: Replace K{U,G}IDT_INIT() with GLOBAL_ROOT_{U,G}ID
>
> Randy Dunlap (2):
> security: keys: delete repeated words in comments
> crypto: asymmetric_keys: fix some comments in pkcs7_parser.h
>
> Tianjia Zhang (1):
> crypto: public_key: Remove redundant header file from public_key.h
>
> Tom Rix (2):
> KEYS: remove redundant memset
> keys: remove trailing semicolon in macro definition
>
> YueHaibing (1):
> crypto: pkcs7: Use match_string() helper to simplify the code
>
>
> Documentation/security/keys/core.rst | 4 ++--
> certs/blacklist.c | 10 +++++-----
> certs/system_keyring.c | 5 +++--
> crypto/asymmetric_keys/asymmetric_type.c | 6 ++++--
> crypto/asymmetric_keys/pkcs7_parser.h | 5 ++---
> crypto/asymmetric_keys/pkcs7_trust.c | 2 +-
> crypto/asymmetric_keys/pkcs7_verify.c | 9 ++++-----
> include/crypto/public_key.h | 1 -
> include/keys/encrypted-type.h | 2 +-
> include/linux/key.h | 5 +++--
> include/linux/verification.h | 2 ++
> samples/Kconfig | 2 +-
> samples/watch_queue/watch_test.c | 2 +-
> security/integrity/ima/ima_mok.c | 3 +--
> security/keys/Kconfig | 8 ++++----
> security/keys/big_key.c | 9 +++------
> security/keys/key.c | 2 ++
> security/keys/keyctl.c | 2 +-
> security/keys/keyctl_pkey.c | 2 --
> security/keys/keyring.c | 10 +++++-----
> 20 files changed, 45 insertions(+), 46 deletions(-)
>
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 00/18] keys: Miscellaneous fixes
2020-12-11 10:51 ` Jarkko Sakkinen
@ 2020-12-11 10:56 ` Jarkko Sakkinen
0 siblings, 0 replies; 7+ messages in thread
From: Jarkko Sakkinen @ 2020-12-11 10:56 UTC (permalink / raw)
To: David Howells
Cc: Jarkko Sakkinen, Alexander A. Klimov, Petko Manolov,
Serge E. Hallyn, linux-kernel, YueHaibing, Herbert Xu, Jann Horn,
linux-crypto, Ben Boeckel, keyrings, Gabriel Krisman Bertazi,
linux-security-module, Randy Dunlap, Mimi Zohar, Tom Rix,
Gustavo A. R. Silva, Alex Shi, Jarkko Sakkinen,
Krzysztof Kozlowski, James Morris, Denis Efremov,
Mickaël Salaün, David Woodhouse, David S. Miller,
Tianjia Zhang
On Fri, Dec 11, 2020 at 12:51:46PM +0200, Jarkko Sakkinen wrote:
> On Wed, Dec 09, 2020 at 12:14:24PM +0000, David Howells wrote:
> >
> > Hi Jarkko,
> >
> > I've extended my collection of minor keyrings fixes for the next merge
> > window. Anything else I should add (or anything I should drop)?
> >
> > The patches can be found on the following branch:
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=keys-fixes
> >
> > David
>
> Looks good to me.
Ugh, responded accidentally twice.
/Jarkko
^ permalink raw reply [flat|nested] 7+ messages in thread