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
---
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(-)
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 <[email protected]>
--Ben
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(-)
>
>
>
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(-)
>
>
>
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