Skip to contentSkip to conversation

s390 patches for 4.19 #3

GIT PULL Martin Schwidefsky 2 participants 4 messages Sep 13, 2018 – Sep 14, 2018

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Hi Linus,

this is the first try to do a pull request for s390 with a signed tag. I keep my fingers crossed that the setup works as intended.

I have used the 8A8FDAE0 signing sub-key of my 26AE5DD2 master key:

pub rsa4096/26AE5DD2 2011-10-10 [SC]
uid [ultimate] Martin Schwidefsky <[email protected]>

sub   rsa4096/1F2A4B67 2011-10-10 [E]
sub   rsa2048/59DAAB8E 2018-09-11 [A]
sub   rsa2048/8A8FDAE0 2018-09-12 [S]

So here we go:

Please pull s390 fixes for 4.19-rc4

The following changes since commit 60c1f89241d49bacf71035470684a8d7b4bb46ea:

Merge tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping (2018-09-02 20:09:36 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-4.19-3

for you to fetch changes up to fa108f95c6769ec15ea59b7db00454b82afc6121:

s390/zcrypt: remove VLA usage from the AP bus (2018-09-12 11:33:37 +0200)

----------------------------------------------------------------
s390 fixes for 4.19-rc4

One fix for the zcrypt driver to correctly handle incomplete encryption/decryption operations.

A cleanup for the aqmask/apmask parsing to avoid variable length arrays on the stack.

----------------------------------------------------------------
Ingo Franzki (1):
s390/crypto: Fix return code checking in cbc_paes_crypt()

Martin Schwidefsky (1):
s390/zcrypt: remove VLA usage from the AP bus

 arch/s390/crypto/paes_s390.c |  2 +-
 drivers/s390/crypto/ap_bus.c | 86 +++++++++++++++++---------------------------
 2 files changed, 34 insertions(+), 54 deletions(-)
arch/s390/crypto/paes_s390.c +1 -1
index 80b2729..ab9a0eb 100644
@@ -208,7 +208,7 @@ static int cbc_paes_crypt(struct blkcipher_desc *desc, unsigned long modifier,
 			      walk->dst.virt.addr, walk->src.virt.addr, n);
 		if (k)
 			ret = blkcipher_walk_done(desc, walk, nbytes - k);
-		if (n < k) {
+		if (k < n) {
 			if (__cbc_paes_set_key(ctx) != 0)
 				return blkcipher_walk_done(desc, walk, -EIO);
 			memcpy(param.key, ctx->pk.protkey, MAXPROTKEYSIZE);
drivers/s390/crypto/ap_bus.c +33 -53

132 lines not on this page · raw message

#1 lore raw
Quoted 5 lines · Martin Schwidefsky

this is the first try to do a pull request for s390 with a signed tag. I keep my fingers crossed that the setup works as intended.

I have used the 8A8FDAE0 signing sub-key of my 26AE5DD2 master key:

The signed tag looks ok, but you haven't actually pushed out your new signing sub-key to the keyservers, so I can't actually verify it.

So a "gpg --send-key" would be a good idea.

Linus

#2 lore raw
Quoted 6 lines · On Thu, 13 Sep 2018 16:26:38 -1000 Linus Torvalds…
Quoted 4 lines · Martin Schwidefsky

this is the first try to do a pull request for s390 with a signed tag. I keep my fingers crossed that the setup works as intended.

Quoted 6 lines
Quoted 1 line

I have used the 8A8FDAE0 signing sub-key of my 26AE5DD2 master key:

The signed tag looks ok, but you haven't actually pushed out your new signing sub-key to the keyservers, so I can't actually verify it.

So a "gpg --send-key" would be a good idea.

I did push it to keys.gnupg.net, but the sub-key is brand new and probably takes some time to sync on the key server network.

The key is there on pgp.mit.edu this morning, it that to one you are using or do you prefer a different one?

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.
#3 lore raw
Quoted 3 lines · Martin Schwidefsky

I did push it to keys.gnupg.net, but the sub-key is brand new and probably takes some time to sync on the key server network.

That's probably it.

Quoted 2 lines

The key is there on pgp.mit.edu this morning, it that to one you are using or do you prefer a different one?

That's the one my laptop is set up to use (I'm on the road right now), but it didn't receive when I tried it earlier. It's probably a pool of servers, not a single one, and it just hadn't percolated to them all. It came in fine now when I tried as a result of this reply, and so now the signature verifies just fine.

Thanks,

Linus