KEYS: Fixes for keyrings
Hi James,
Can you please pull these fixes and send them on upstream:
(1) Reinstate the production of EPERM for key types beginning with '.' in requests from userspace.
(2) Tidy up the cleanup of PKCS#7 message signed information blocks and fix a bug this made more obvious.
David
---
The following changes since commit 2324067fa9a41b2d0b6ddbc7ac0497d105593b76:
Merge tag 'regmap-v3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap (2014-09-15 16:20:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git tags/keys-fixes-20140916
for you to fetch changes up to 553619918a85dd66a24059b95a4f5625502f2df7:
PKCS#7: Fix the parser cleanup to drain parsed out X.509 certs (2014-09-16 14:18:28 +0100)
----------------------------------------------------------------
(from the branch description for keys-fixes local branch)
Keyrings fixes
Keyrings fixes
----------------------------------------------------------------
David Howells (3):
KEYS: Reinstate EPERM for a key type name beginning with a '.' PKCS#7: Provide a single place to do signed info block freeing PKCS#7: Fix the parser cleanup to drain parsed out X.509 certs
crypto/asymmetric_keys/pkcs7_parser.c | 61 +++++++++++++++++++---------------- security/keys/keyctl.c | 2 ++ 2 files changed, 35 insertions(+), 28 deletions(-)
Quoted 1 line
Can you please pull these fixes and send them on upstream:
Can you also pull them into your next branch as I have stuff for your next branch that depends on those changes?
Thanks,
David
Quoted 4 lines · David Howells
Quoted 1 line
Can you please pull these fixes and send them on upstream:
Can you also pull them into your next branch as I have stuff for your next branch that depends on those changes?
No, if they go direct to Linus, they don't go into -next.
Signature · 2 lines
James Morris <[email protected]>
Quoted 1 line · James Morris
No, if they go direct to Linus, they don't go into -next.
Can you then sync your -next branch to Linus after Linus takes them please?
David
Quoted 5 lines · David Howells
Quoted 1 line · James Morris
No, if they go direct to Linus, they don't go into -next.
Can you then sync your -next branch to Linus after Linus takes them please?
Nope, I only want to sync on point releases unless absolutely necessary.
Signature · 2 lines
James Morris <[email protected]>
Quoted 5 lines · James Morris
Quoted 3 lines
Quoted 1 line
No, if they go direct to Linus, they don't go into -next.
Can you then sync your -next branch to Linus after Linus takes them please?
Nope, I only want to sync on point releases unless absolutely necessary.
In that case, can you please just pull the request in this message that I sent you:
[GIT PULL] KEYS: Changes for keyrings for security/next
It has the aforementioned fixes and the stuff for -next both. If you can just pull the lot into your -next branch rather than sending the fixes upstream at this point.
David
Quoted 8 lines · David Howells
Quoted 5 lines · James Morris
Quoted 3 lines
Quoted 1 line
No, if they go direct to Linus, they don't go into -next.
Can you then sync your -next branch to Linus after Linus takes them please?
Nope, I only want to sync on point releases unless absolutely necessary.
Quoted 8 lines
In that case, can you please just pull the request in this message that I sent you:
[GIT PULL] KEYS: Changes for keyrings for
security/nextIt has the aforementioned fixes and the stuff for -next both. If you can just pull the lot into your -next branch rather than sending the fixes upstream at this point.
David, consider copying stable to automatically have bug fixes backported. After your "signed-off-by" add "Cc:
<[email protected]> <release>" to indicate which kernel release.
Mimi
Quoted 8 lines · David Howells
Can you please pull these fixes and send them on upstream:
(1) Reinstate the production of EPERM for key types beginning with '.' in requests from userspace.
(2) Tidy up the cleanup of PKCS#7 message signed information blocks and fix a bug this made more obvious.
Please ignore this pull request. To make things easier, I've rebased on the most recent common ancestor of linus/master and security/next so that you can pull it into both. I'll issue another pull request.
David