tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: aesni-intel - fixed problem with packets that are not multiple of 64bytes

Linus Torvalds 036a9826 b34e138e

+16 -3
unified split
+4 -1
arch/x86/crypto/aesni-intel_asm.S
··· 1612 1612 movdqa SHUF_MASK(%rip), %xmm10 1613 1613 PSHUFB_XMM %xmm10, %xmm0 1614 1614 1615 + 1615 1616 ENCRYPT_SINGLE_BLOCK %xmm0, %xmm1 # Encrypt(K, Yn) 1616 1617 sub $16, %r11 1617 1618 add %r13, %r11 ··· 1635 1634 # GHASH computation for the last <16 byte block 1636 1635 sub %r13, %r11 1637 1636 add $16, %r11 1638 - PSHUFB_XMM %xmm10, %xmm1 1637 + 1638 + movdqa SHUF_MASK(%rip), %xmm10 1639 + PSHUFB_XMM %xmm10, %xmm0 1639 1640 1640 1641 # shuffle xmm0 back to output as ciphertext 1641 1642
+12 -2
arch/x86/crypto/aesni-intel_glue.c
··· 828 828 struct cryptd_aead *cryptd_tfm; 829 829 struct aesni_rfc4106_gcm_ctx *ctx = (struct aesni_rfc4106_gcm_ctx *) 830 830 PTR_ALIGN((u8 *)crypto_tfm_ctx(tfm), AESNI_ALIGN); 831 + struct crypto_aead *cryptd_child; 832 + struct aesni_rfc4106_gcm_ctx *child_ctx; 831 833 cryptd_tfm = cryptd_alloc_aead("__driver-gcm-aes-aesni", 0, 0); 832 834 if (IS_ERR(cryptd_tfm)) 833 835 return PTR_ERR(cryptd_tfm); 836 + 837 + cryptd_child = cryptd_aead_child(cryptd_tfm); 838 + child_ctx = aesni_rfc4106_gcm_ctx_get(cryptd_child); 839 + memcpy(child_ctx, ctx, sizeof(*ctx)); 834 840 ctx->cryptd_tfm = cryptd_tfm; 835 841 tfm->crt_aead.reqsize = sizeof(struct aead_request) 836 842 + crypto_aead_reqsize(&cryptd_tfm->base); ··· 929 923 int ret = 0; 930 924 struct crypto_tfm *tfm = crypto_aead_tfm(parent); 931 925 struct aesni_rfc4106_gcm_ctx *ctx = aesni_rfc4106_gcm_ctx_get(parent); 926 + struct crypto_aead *cryptd_child = cryptd_aead_child(ctx->cryptd_tfm); 927 + struct aesni_rfc4106_gcm_ctx *child_ctx = 928 + aesni_rfc4106_gcm_ctx_get(cryptd_child); 932 929 u8 *new_key_mem = NULL; 933 930 934 931 if (key_len < 4) { ··· 975 966 goto exit; 976 967 } 977 968 ret = rfc4106_set_hash_subkey(ctx->hash_subkey, key, key_len); 969 + memcpy(child_ctx, ctx, sizeof(*ctx)); 978 970 exit: 979 971 kfree(new_key_mem); 980 972 return ret; ··· 1007 997 int ret; 1008 998 struct crypto_aead *tfm = crypto_aead_reqtfm(req); 1009 999 struct aesni_rfc4106_gcm_ctx *ctx = aesni_rfc4106_gcm_ctx_get(tfm); 1010 - struct crypto_aead *cryptd_child = cryptd_aead_child(ctx->cryptd_tfm); 1011 1000 1012 1001 if (!irq_fpu_usable()) { 1013 1002 struct aead_request *cryptd_req = ··· 1015 1006 aead_request_set_tfm(cryptd_req, &ctx->cryptd_tfm->base); 1016 1007 return crypto_aead_encrypt(cryptd_req); 1017 1008 } else { 1009 + struct crypto_aead *cryptd_child = cryptd_aead_child(ctx->cryptd_tfm); 1018 1010 kernel_fpu_begin(); 1019 1011 ret = cryptd_child->base.crt_aead.encrypt(req); 1020 1012 kernel_fpu_end(); ··· 1028 1018 int ret; 1029 1019 struct crypto_aead *tfm = crypto_aead_reqtfm(req); 1030 1020 struct aesni_rfc4106_gcm_ctx *ctx = aesni_rfc4106_gcm_ctx_get(tfm); 1031 - struct crypto_aead *cryptd_child = cryptd_aead_child(ctx->cryptd_tfm); 1032 1021 1033 1022 if (!irq_fpu_usable()) { 1034 1023 struct aead_request *cryptd_req = ··· 1036 1027 aead_request_set_tfm(cryptd_req, &ctx->cryptd_tfm->base); 1037 1028 return crypto_aead_decrypt(cryptd_req); 1038 1029 } else { 1030 + struct crypto_aead *cryptd_child = cryptd_aead_child(ctx->cryptd_tfm); 1039 1031 kernel_fpu_begin(); 1040 1032 ret = cryptd_child->base.crt_aead.decrypt(req); 1041 1033 kernel_fpu_end();