Hi Linus:
This push fixes a bug in the aesni-intel driver that may cause
incorrect results for certain input sizes.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Tadeusz Struk (1):
crypto: aesni-intel - fixed problem with packets that are not multiple of 64bytes
arch/x86/crypto/aesni-intel_asm.S | 5 ++++-
arch/x86/crypto/aesni-intel_glue.c | 14 ++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a memory corruption bug due to undersized kmalloc
in the caam driver. The patch has actually been in my tree for
a month but I had incorrectly placed it in the tree for linux-next.
Sorry about that.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Kim Phillips (1):
crypto: caam - fix operator precedence in shared descriptor allocation
drivers/crypto/caam/caamalg.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a NULL-pointer dereference that can be triggered
from user-space.
Please pull from
git://github.com/herbertx/crypto.git
Nick Bowler (1):
crypto: ghash - Avoid null pointer dereference if no key is set
crypto/ghash-generic.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Fri, 21 Oct 2011, Herbert Xu wrote:
> Hi Linus:
>
> This push fixes a NULL-pointer dereference that can be triggered
> from user-space.
>
> Please pull from
>
> git://github.com/herbertx/crypto.git
>
Hi Herbert,
When I pull from this, I also get
commit 9c129165af0225c63c37d1896ac9b0d34e48b69f
Author: Jamie Iles <[email protected]>
Date: Mon Jun 6 12:31:17 2011 +0100
crypto: picoxcell - fix possible invalid pointer dereference
which looks unrelated?
On Fri, Oct 21, 2011 at 02:41:54AM -0700, David Rientjes wrote:
> On Fri, 21 Oct 2011, Herbert Xu wrote:
>
> > Hi Linus:
> >
> > This push fixes a NULL-pointer dereference that can be triggered
> > from user-space.
> >
> > Please pull from
> >
> > git://github.com/herbertx/crypto.git
> >
>
> Hi Herbert,
>
> When I pull from this, I also get
>
> commit 9c129165af0225c63c37d1896ac9b0d34e48b69f
> Author: Jamie Iles <[email protected]>
> Date: Mon Jun 6 12:31:17 2011 +0100
>
> crypto: picoxcell - fix possible invalid pointer dereference
>
> which looks unrelated?
Sorry, I seem to have based it on a dirty tree. It should be
fixed now.
Thanks!
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Linus:
This push fixes a build problem with NET disabled and potential
lock mismatch in the new configuration interface.
Please pull from
git://github.com/herbertx/crypto.git
The top commit object is
commit 3acc84739dd5d746840f881ad4d60bd2a428f1dd
Author: Herbert Xu <[email protected]>
Date: Thu Nov 3 23:46:07 2011 +1100
crypto: algapi - Fix build problem with NET disabled
The report functions use NLA_PUT so we need to ensure that NET
is enabled.
Reported-by: Luis Henriques <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Herbert Xu (1):
crypto: algapi - Fix build problem with NET disabled
Jonathan Corbet (1):
crypto: user - Fix rwsem leak in crypto_user
crypto/ablkcipher.c | 14 ++++++++++++++
crypto/aead.c | 14 ++++++++++++++
crypto/ahash.c | 7 +++++++
crypto/blkcipher.c | 7 +++++++
crypto/crypto_user.c | 3 ---
crypto/pcompress.c | 7 +++++++
crypto/rng.c | 7 +++++++
crypto/shash.c | 7 +++++++
8 files changed, 63 insertions(+), 3 deletions(-)
Thanks,
- --
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIVAwUBTrxXWscnHQpJsYunAQKBRw/8DRK2CcLasZYAp4OwOaopmTliXYjaoQTB
hqignMgOqhF23ObQjpBqva7bRc+dxWWOZ3kZV4+F+/tm/3dHH7+PzgGkQOHcjYLC
/puEJ299zcsGmu3dJLO5z24f2QU2h4gpADqUBdZQJZY8iDhEYLX3bZsTRIKAVDmW
RF83ksJe8ejsK+C0O2dyH0aJCfXhhsDF7JFgtZyJhfjjzIrPCM6E6mEjsF59s6zr
nOINeH+8ZT8Bx3IXtmSAN6nBDhB+bNrSoAO3siaL67T2nnjUZ0h6Cg/laiDBs7fi
7E9nvF2dknN8h6Z7RdzBbgTofX20BTBJXeY1Gzx07w4yMUgIznjYL6Me9a307cAY
3dDe465sztWXqieLtcjAp+GpwOGzpp6T4lWKXucC6m4I7oNCSS2FGGobdKIilESC
qIdvVDax+j9YhN6zBJrktA2EBu47QEIzs31Ncmyqv6Saxdbu6fFy2nyhX30RZ3D2
VKly6wWUMOkbIfN3iA8GdBSZpm83R3oy9aIMX+JEP0BUwX1JdcDRMlHsvN+pVrqX
1ZlnXMwiZ7i3vxPbnTPdLfDjBY+4cNt7tJejEqOPBSRpEirzsTXTKSL51af9c9gH
Rmt7qaDQcLkGwaZF/AolbvGgVAj99C+f/K+7UspzYBgatyck35UoJAK864zsL8Xt
trAQYv/cHfU=
=MC9A
-----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Linus:
This push fixes a problem with mv_cesa the driver where it makes
incorrect hashes on input chunks greater than 1920 bytes.
Please pull from
git://github.com/herbertx/crypto.git
The top commit object is
commit 274252862f386b7868f35bf5ceaa5391a8ccfdf3
Author: Phil Sutter <[email protected]>
Date: Wed Nov 16 18:28:01 2011 +0100
crypto: mv_cesa - fix hashing of chunks > 1920 bytes
Phil Sutter (1):
crypto: mv_cesa - fix hashing of chunks > 1920 bytes
drivers/crypto/mv_cesa.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
Thanks,
- --
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIVAwUBTtBP9McnHQpJsYunAQJpTg//XFdRLLF46ZZQID12VqrfBJB8VrzGWY0q
QQQH+oe5lq9ppjkFz5Fk2fsNSj5a3kDtPQK9SBVl0TThC0BVuA3lNXEmcfnQoOjZ
vj1KUl9zSiwVcKm/lkbzlDHdU6wE1MxwP8z3XEdMMs7Pj3YWf12XUZQSWkeeFiy0
Tz5Oz9hbIpYLW+U458xjhoODJAk7JSItS+N2ud7JcqwV7nTsGqP95mDsbfiXi7Fn
1FiXdFYogAyyqLPDi6EbENCEbIvfV1JEbg/S7LOe7akxZwlJg92cevGHS/oDbxuU
N7/9nxgANbZBG3ApUw6UAJWSBuJBZ4C96ABc/LXY8ZzgwYNaiNloNMr1F/j+MZQ0
AtP58bK6IcSw7QBi8qzKV7P0q/pAxOYnDeaS4Sla8Pb4MvEAblSJF45/YHBublrE
Y5tMif4ib8Gy/yXF6bu0ohfP0LfKtXq5pZK6C0blcYdMyxKxcaQWx+6fATOWxdCL
OcrY6q2/dYG+zXSWJs13/YfWFcn3sRdjnVqFo2ItUbvD3ZL9WSCKuhd9PUZPcxqW
VEXKDaKA1G9aAn+KNkciZ48SiYCOMm4Xl6l11bsV2nx13i401KoM5hLcFv5CfZ89
Xwu+j2N4mhlLxPG08H4zG19hLgOdpY0Ql5VsZPf3z4Bf0G+gnZC6StDgvfJHEX3Z
sKy1PVqrB7U=
=iYTU
-----END PGP SIGNATURE-----
Hi Linus:
This push fixes a race condition in sha512 that affects users
who use it in process context and softirq context concurrently,
in particular, this affects IPsec. The result of the race is
the production of incorrect hashes, which for IPsec leands to
loss of connectivity.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Alexey Dobriyan (2):
crypto: sha512 - make it work, undo percpu message schedule
crypto: sha512 - reduce stack usage to safe number
crypto/sha512_generic.c | 62 +++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 28 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Wed, Jan 25, 2012 at 6:43 PM, Herbert Xu <[email protected]> wrote:
>
> This push fixes a race condition in sha512 that affects users
> who use it in process context and softirq context concurrently,
> in particular, this affects IPsec. ?The result of the race is
> the production of incorrect hashes, which for IPsec leands to
> loss of connectivity.
Ugh. This once more has the crazy signed integer modulus operator,
which can be quite expensive depending on whether the compiler can
tell whether it is always positive or not.
Also, that modulus is exposed everywhere.
In git, the sha1 implementation (which has many of the same issues) does this:
/* This "rolls" over the 512-bit array */
#define W(x) (array[(x)&15])
which means that the modulus exists in just one place (and is the
correct binary 'and', not the possibly-expensive division).
We also avoid the problem with absolutely horrible gcc register usage
by having an arch-specific "accessor macro":
/*
* If you have 32 registers or more, the compiler can (and should)
* try to change the array[] accesses into registers. However, on
* machines with less than ~25 registers, that won't really work,
* and at least gcc will make an unholy mess of it.
*
* So to avoid that mess which just slows things down, we force
* the stores to memory to actually happen (we might be better off
* with a 'W(t)=(val);asm("":"+m" (W(t))' there instead, as
* suggested by Artur Skawina - that will also make gcc unable to
* try to do the silly "optimize away loads" part because it won't
* see what the value will be).
*
* Ben Herrenschmidt reports that on PPC, the C version comes close
* to the optimized asm with this (ie on PPC you don't want that
* 'volatile', since there are lots of registers).
*
* On ARM we get the best code generation by forcing a full memory barrier
* between each SHA_ROUND, otherwise gcc happily get wild with spilling and
* the stack frame size simply explode and performance goes down the drain.
*/
#if defined(__i386__) || defined(__x86_64__)
#define setW(x, val) (*(volatile unsigned int *)&W(x) = (val))
#elif defined(__GNUC__) && defined(__arm__)
#define setW(x, val) do { W(x) = (val); __asm__("":::"memory"); } while (0)
#else
#define setW(x, val) (W(x) = (val))
#endif
which is not pretty, but as you guys found out, the alternative can be
much worse (ie totally crazy gcc register spilling)
Linus
On Wed, Jan 25, 2012 at 07:35:19PM -0800, Linus Torvalds wrote:
>
> Ugh. This once more has the crazy signed integer modulus operator,
> which can be quite expensive depending on whether the compiler can
> tell whether it is always positive or not.
Oops, I had incorrectly applied the first patch in the thread.
I've fixed it in the tree now.
> We also avoid the problem with absolutely horrible gcc register usage
> by having an arch-specific "accessor macro":
We could certainly do something like that. Although I'd be
more comfortable with pushing this through linux-next, OK?
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Alexey Dobriyan (2):
crypto: sha512 - make it work, undo percpu message schedule
crypto: sha512 - reduce stack usage to safe number
Herbert Xu (1):
crypto: sha512 - Use binary and instead of modulus
crypto/sha512_generic.c | 62 +++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 28 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Wed, Jan 25, 2012 at 8:07 PM, Herbert Xu <[email protected]> wrote:
>
> Oops, I had incorrectly applied the first patch in the thread.
>
> I've fixed it in the tree now.
Oh well, I already pulled your tree. I just wanted to voice a few
comments on it.
>> We also avoid the problem with absolutely horrible gcc register usage
>> by having an arch-specific "accessor macro":
>
> We could certainly do something like that. ?Although I'd be
> more comfortable with pushing this through linux-next, OK?
Absolutely.
Linus
Hi Linus:
This push updates the sha512 fix so that it doesn't cause excessive
stack usage on i386. This is done by reverting to the original
code, and avoiding the W duplication by moving its initialisation
into the loop.
As the underlying code is in fact the one that we have used for years,
I'm pushing this now instead of postponing to the next cycle.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Herbert Xu (2):
crypto: sha512 - Use binary and instead of modulus
crypto: sha512 - Avoid stack bloat on i386
crypto/sha512_generic.c | 70 ++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 37 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
Dave reported that even with the latest stack bloat reduction
fix for i386, the stack usage of sha512 still exceeded 1024 bytes
on sparc32. However, with Alexey's ror64 patch applied, the stack
usage goes back down to a more respectable 824.
So I've moved the ror64 patch from cryptodev to crypto and I'm
pushing it to you now.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Alexey Dobriyan (1):
crypto: sha512 - use standard ror64()
crypto/sha512_generic.c | 13 ++++---------
include/linux/bitops.h | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 9 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a bug in mv_cesa that causes all hash operations
that supply data on a final operation to fail.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Phil Sutter (1):
crypto: mv_cesa - fix final callback not ignoring input data
drivers/crypto/mv_cesa.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a build problem where two crypto modules both
try to export the same symbols (which shouldn't have been exported
in the first place).
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Jussi Kivilinna (2):
crypto: camellia-x86_64 - module init/exit functions should be static
crypto: twofish-x86_64-3way - module init/exit functions should be static
arch/x86/crypto/camellia_glue.c | 4 ++--
arch/x86/crypto/twofish_glue_3way.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a number of issues:
* Fix for CPU hotplug hang in padata.
* Avoid using cpu_active inappropriately in pcrypt and padata.
* Fix for user-space algorithm lookup hang with IV generators.
* Fix for netlink dump of algorithms where stuff went missing due
to incorrect calculation of message size.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Steffen Klassert (6):
padata: Add a reference to the api documentation
padata: Use the online cpumask as the default
padata: Fix cpu hotplug
crypto: pcrypt - Use the online cpumask as the default
crypto: user - Fix lookup of algorithms with IV generator
crypto: user - Fix size of netlink dump message
crypto/ablkcipher.c | 4 +-
crypto/aead.c | 4 +-
crypto/crypto_user.c | 80 +++++++++++++++++++++++++++++++++++-
crypto/pcrypt.c | 8 ++--
include/crypto/internal/aead.h | 2 +
include/crypto/internal/skcipher.h | 2 +
include/linux/cryptouser.h | 3 +
kernel/padata.c | 13 ++++--
8 files changed, 103 insertions(+), 13 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a number of issues:
* Locking fix for talitos driver.
* Fix 64-bit counter overflow in SHA-512.
* Build fix for ixp4xx.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Horia Geanta (1):
crypto: talitos - properly lock access to global talitos registers
Kent Yoder (1):
crypto: sha512 - Fix byte counter overflow in SHA-512
Michał Wróbel (1):
crypto: ixp4xx - include fix
crypto/sha512_generic.c | 2 +-
drivers/crypto/ixp4xx_crypto.c | 1 +
drivers/crypto/talitos.c | 20 +++++++++++++++++---
3 files changed, 19 insertions(+), 4 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes an unaligned fault on x86-32 with aesni-intel
and an RNG failure with atmel-rng (repeated bits).
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Mathias Krause (1):
crypto: aesni-intel - fix unaligned cbc decrypt for x86-32
Peter Korsgaard (1):
hwrng: atmel-rng - fix race condition leading to repeated bits
arch/x86/crypto/aesni-intel_asm.S | 6 ++++--
drivers/char/hw_random/atmel-rng.c | 7 +++++++
2 files changed, 11 insertions(+), 2 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes another bug in the atmel-rng that made it produce
completely useless output.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Peter Korsgaard (1):
hwrng: atmel-rng - fix data valid check
drivers/char/hw_random/atmel-rng.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a build error on 32-bit archs in the hifn driver
as well as a potential deadlock in the caam driver.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Jussi Kivilinna (1):
crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs
Kim Phillips (1):
crypto: caam - fix possible deadlock condition
drivers/crypto/caam/jr.c | 10 +++++-----
drivers/crypto/hifn_795x.c | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes the authenc self-test crash as well as a missing
export of a symbol used by a module.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Ben Collins (1):
crypto/caam: Export gen_split_key symbol for other modules
Herbert Xu (1):
crypto: authenc - Fix crash with zero-length assoc data
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a potential panic in cryptd which may occur with
crypto drivers such as aesni-intel.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Jussi Kivilinna (1):
crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption
crypto/cryptd.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push removes IPsec ESN support from the talitos/caam drivers
since they were implemented incorrectly, causing interoperability
problems if ESN is used with them.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Horia Geanta (2):
Revert "crypto: talitos - add IPsec ESN support"
Revert "crypto: caam - add IPsec ESN support"
drivers/crypto/caam/caamalg.c | 27 ++-------------------------
drivers/crypto/caam/compat.h | 1 -
drivers/crypto/talitos.c | 30 ++----------------------------
3 files changed, 4 insertions(+), 54 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Would you be able to incorporate the GMAC ESN bug fix in 3.9?
Thanks,
Chaoxing
--------------------------------
Thanks Jussi, the patch fixes the problem.
You may commit it officially.
Chaoxing
-----Original Message-----
From: Jussi Kivilinna [mailto:[email protected]]
Sent: Tuesday, March 26, 2013 4:16 PM
To: Chaoxing Lin
Cc: [email protected]
Subject: Re: potential bug in GMAC implementation. not work in ESN mode
On 25.03.2013 18:12, Chaoxing Lin wrote:
> 2nd ping....
>
> Nobody is maintaining crypto/gcm.c?
>
>
>
> -----Original Message-----
> From: Chaoxing Lin
> Sent: Friday, March 08, 2013 11:38 AM
> To: '[email protected]'
> Subject: potential bug in GMAC implementation. not work in ESN mode
>
> I was testing ipsec with GMAC and found that the rfc4543 GMAC implementation in kernel software crypto work in "esp=aes256gmac-noesn!" mode.
> It does not work in in "esp=aes256gmac-esn!" mode. The tunnel was established but no data traffic is possible.
>
> Looking at source code, I found this piece of code is suspicious.
> Line 1146~1147 tries to put req->assoc to assoc[1]. But I think this way only works when req->assoc has only one segment. In ESN mode, req->assoc contains 3 segments (SPI, SN-hi, SN-low). Line 1146~1147 will only attach SPI segment(with total length) in assoc.
>
> Please let me know whether I understand it right.
Your analysis seems correct. Does attached the patch fix the problem? (I've only compile tested it.)
-Jussi
> Thanks,
>
> Chaoxing
>
>
> Source from kernel 3.8.2
> path: root/crypto/gcm.c
>
> 1136: /* construct the aad */
> 1137: dstp = sg_page(dst);
> vdst = PageHighMem(dstp) ? NULL : page_address(dstp) + dst->offset;
>
> sg_init_table(payload, 2);
> sg_set_buf(payload, req->iv, 8);
> scatterwalk_crypto_chain(payload, dst, vdst == req->iv + 8, 2);
> assoclen += 8 + req->cryptlen - (enc ? 0 : authsize);
>
> sg_init_table(assoc, 2);
> 1146: sg_set_page(assoc, sg_page(req->assoc), req->assoc->length,
> 1147: req->assoc->offset);
> scatterwalk_crypto_chain(assoc, payload, 0, 2);
>
> aead_request_set_tfm(subreq, ctx->child);
> aead_request_set_callback(subreq, req->base.flags, req->base.complete,
> req->base.data);
> aead_request_set_crypt(subreq, cipher, cipher, enc ? 0 : authsize, iv);
> 1154: aead_request_set_assoc(subreq, assoc, assoclen);
> --
> To unsubscribe from this list: send the line "unsubscribe
> linux-crypto" in the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Herbert Xu
Sent: Thursday, March 28, 2013 4:29 AM
To: Linus Torvalds; David S. Miller; Linux Kernel Mailing List; Linux Crypto Mailing List
Subject: Crypto Fixes for 3.9
Hi Linus:
This push removes IPsec ESN support from the talitos/caam drivers since they were implemented incorrectly, causing interoperability problems if ESN is used with them.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Horia Geanta (2):
Revert "crypto: talitos - add IPsec ESN support"
Revert "crypto: caam - add IPsec ESN support"
drivers/crypto/caam/caamalg.c | 27 ++-------------------------
drivers/crypto/caam/compat.h | 1 -
drivers/crypto/talitos.c | 30 ++----------------------------
3 files changed, 4 insertions(+), 54 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Chaoxing Lin <[email protected]> wrote:
> Would you be able to incorporate the GMAC ESN bug fix in 3.9?
I'd be happy to once I get the patch.
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a GCM bug that breaks IPsec and a compile problem
in ux500.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Jussi Kivilinna (1):
crypto: gcm - fix assumption that assoc has one segment
Linus Walleij (1):
crypto: ux500 - add missing comma
crypto/gcm.c | 17 ++++++++++++++---
drivers/crypto/ux500/cryp/cryp_core.c | 2 +-
2 files changed, 15 insertions(+), 4 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a kernel memory leak in the algif interface.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Mathias Krause (1):
crypto: algif - suppress sending source address information in recvmsg
crypto/algif_hash.c | 2 ++
crypto/algif_skcipher.c | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a crash in the new sha256_ssse3 driver as well as
a DMA setup/teardown bug in caam.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Horia Geanta (1):
crypto: caam - fix inconsistent assoc dma mapping direction
Jussi Kivilinna (1):
crypto: sha256_ssse3 - fix stack corruption with SSSE3 and AVX implementations
arch/x86/crypto/sha256-avx-asm.S | 2 +-
arch/x86/crypto/sha256-ssse3-asm.S | 2 +-
drivers/crypto/caam/caamalg.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a build problem in sahara and temporarily disables
two new optimisations because of performance regressions until a
permanent fix is ready.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Arnd Bergmann (1):
crypto: sahara - fix building as module
Jussi Kivilinna (2):
crypto: twofish - disable AVX2 implementation
crypto: blowfish - disable AVX2 implementation
crypto/Kconfig | 2 ++
drivers/crypto/sahara.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes an unaligned crash in XTS mode when using aseni_intel.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Jussi Kivilinna (1):
crypto: aesni_intel - fix accessing of unaligned memory
arch/x86/crypto/aesni-intel_asm.S | 48 ++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 16 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a crash in the crypto layer exposed by an SCTP
test tool.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Herbert Xu (1):
crypto: algboss - Hold ref count on larval
crypto/algboss.c | 15 ++++++++-------
crypto/api.c | 6 ------
crypto/internal.h | 6 ++++++
3 files changed, 14 insertions(+), 13 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a memory corruption issue in caam, as well as
reverting the new optimised crct10dif implementation as it breaks
boot on initrd systems.
Hopefully crct10dif will be reinstated once the supporting code
is added so that it doesn't break boot.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Herbert Xu (1):
Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
Vakul Garg (1):
crypto: caam - Fixed the memory out of bound overwrite issue
arch/x86/crypto/Makefile | 2 -
arch/x86/crypto/crct10dif-pcl-asm_64.S | 643 -------------------------------
arch/x86/crypto/crct10dif-pclmul_glue.c | 151 --------
crypto/Kconfig | 19 -
crypto/Makefile | 1 -
crypto/crct10dif.c | 178 ---------
crypto/tcrypt.c | 8 -
crypto/testmgr.c | 10 -
crypto/testmgr.h | 33 --
drivers/crypto/caam/caamhash.c | 2 +-
include/linux/crc-t10dif.h | 4 -
lib/Kconfig | 2 -
lib/crc-t10dif.c | 73 ++--
13 files changed, 44 insertions(+), 1082 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a 7+ year race condition in the crypto API that
causes sporadic crashes when multiple threads load the same
algorithm.
It also fixes the crct10dif algorithm again to prevent boot
failures on systems where the initramfs tool ignores module
softdeps.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Herbert Xu (2):
crypto: api - Fix race condition in larval lookup
crypto: crct10dif - Add fallback for broken initrds
crypto/Makefile | 2 +-
crypto/api.c | 7 +-
crypto/{crct10dif.c => crct10dif_common.c} | 100 +--------------------------
crypto/{crct10dif.c => crct10dif_generic.c} | 53 +-------------
lib/crc-t10dif.c | 11 ++-
5 files changed, 20 insertions(+), 153 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Fri, Sep 13, 2013 at 4:30 AM, Herbert Xu <[email protected]> wrote:
>
> Herbert Xu (2):
> crypto: api - Fix race condition in larval lookup
> crypto: crct10dif - Add fallback for broken initrds
>
> crypto/Makefile | 2 +-
> crypto/api.c | 7 +-
> crypto/{crct10dif.c => crct10dif_common.c} | 100 +--------------------------
> crypto/{crct10dif.c => crct10dif_generic.c} | 53 +-------------
> lib/crc-t10dif.c | 11 ++-
> 5 files changed, 20 insertions(+), 153 deletions(-)
Please fix your script. You apparently have it using "-C" to find
copies, which can be very useful to see what is going on especially
with "--summary" (which you don't have), but is misleading when
sending diffstats when people don't expect it.
The pull request does not have "20 insertions", it has "146
insertions", and it's just that a fair chunk of them come from a file
being essentially duplicated. See the difference:
With copy detection ("git diff -C --stat --summary")
crypto/Makefile | 2 +-
crypto/api.c | 7 +-
crypto/{crct10dif.c => crct10dif_common.c} | 100 +-------------------
crypto/{crct10dif.c => crct10dif_generic.c} | 53 +----------
lib/crc-t10dif.c | 11 ++-
5 files changed, 20 insertions(+), 153 deletions(-)
copy crypto/{crct10dif.c => crct10dif_common.c} (63%)
rename crypto/{crct10dif.c => crct10dif_generic.c} (55%)
With just rename detection (git diff -M --stat --summary)
crypto/Makefile | 2 +-
crypto/api.c | 7 +-
crypto/{crct10dif.c => crct10dif_common.c} | 100 +---------------
crypto/crct10dif_generic.c | 127 +++++++++++++++++++++
lib/crc-t10dif.c | 11 +-
5 files changed, 146 insertions(+), 101 deletions(-)
rename crypto/{crct10dif.c => crct10dif_common.c} (63%)
create mode 100644 crypto/crct10dif_generic.c
and your pull request looked really misleading because it did "-C" but
didn't have that summary pointing out that one of them was a copy.
So please use "-M --stat --summary". That's what git shows me when I
do a "git pull", so that's what I'm going to compare with..
As mentioned "-C" _is_ useful, but it's useful when you're
specifically looking for "that's a lot of new lines, is it copying old
files" kind of things.
Linus
On Fri, Sep 13, 2013 at 07:22:55AM -0700, Linus Torvalds wrote:
> On Fri, Sep 13, 2013 at 4:30 AM, Herbert Xu <[email protected]> wrote:
> >
> > Herbert Xu (2):
> > crypto: api - Fix race condition in larval lookup
> > crypto: crct10dif - Add fallback for broken initrds
> >
> > crypto/Makefile | 2 +-
> > crypto/api.c | 7 +-
> > crypto/{crct10dif.c => crct10dif_common.c} | 100 +--------------------------
> > crypto/{crct10dif.c => crct10dif_generic.c} | 53 +-------------
> > lib/crc-t10dif.c | 11 ++-
> > 5 files changed, 20 insertions(+), 153 deletions(-)
>
> Please fix your script. You apparently have it using "-C" to find
> copies, which can be very useful to see what is going on especially
> with "--summary" (which you don't have), but is misleading when
> sending diffstats when people don't expect it.
Sorry, will do for future pushes. FWIW the -M stats are
crypto/Makefile | 2 +-
crypto/api.c | 7 +-
crypto/{crct10dif.c => crct10dif_common.c} | 100 +---------------------
crypto/crct10dif_generic.c | 127 ++++++++++++++++++++++++++++
lib/crc-t10dif.c | 11 ++-
5 files changed, 146 insertions(+), 101 deletions(-)
> With just rename detection (git diff -M --stat --summary)
> crypto/Makefile | 2 +-
> crypto/api.c | 7 +-
> crypto/{crct10dif.c => crct10dif_common.c} | 100 +---------------
> crypto/crct10dif_generic.c | 127 +++++++++++++++++++++
> lib/crc-t10dif.c | 11 +-
> 5 files changed, 146 insertions(+), 101 deletions(-)
> rename crypto/{crct10dif.c => crct10dif_common.c} (63%)
> create mode 100644 crypto/crct10dif_generic.c
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a number of crashes triggered by a previous
crypto self-test update. It also fixes a build problem in the
caam driver, as well as a concurrency issue in s390. Finally
there is a pair of fixes to bugs in the crypto scatterwalk code
and authenc that may lead to crashes.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Gerald Schaefer (1):
crypto: s390 - Fix aes-xts parameter corruption
Horia Geanta (5):
crypto: talitos - corrrectly handle zero-length assoc data
crypto: ccm - Fix handling of zero plaintext when computing mac
crypto: caam - fix aead sglen for case 'dst != src'
crypto: talitos - fix aead sglen for case 'dst != src'
crypto: testmgr - fix sglen in test_aead for case 'dst != src'
Michael Neuling (1):
crypto: caam - Add missing Job Ring include
Tom Lendacky (2):
crypto: authenc - Find proper IV address in ablkcipher callback
crypto: scatterwalk - Set the chain pointer indication bit
arch/s390/crypto/aes_s390.c | 31 ++++++++++--------
crypto/authenc.c | 7 ++--
crypto/ccm.c | 3 +-
crypto/tcrypt.c | 4 ++
crypto/testmgr.c | 26 +++++++--------
drivers/crypto/caam/caamalg.c | 51 +++++++++++++++++-------------
drivers/crypto/caam/jr.c | 1 +
drivers/crypto/talitos.c | 68 +++++++++++++++++++++++-----------------
include/crypto/scatterwalk.h | 1 +
9 files changed, 109 insertions(+), 83 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
Unfortunately the last push that fixed a crash in the crypto
scatterwalk code introduced a new crash when SG debugging is
enabled. This push fixes that.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Tom Lendacky (1):
crypto: scatterwalk - Use sg_chain_ptr on chain entries
include/crypto/scatterwalk.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a build error on ARM that was introduced in 3.13-rc1.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Krzysztof Hałasa (1):
crypto: ixp4xx - Fix kernel compile error
drivers/crypto/ixp4xx_crypto.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a number of concurrency issues on s390 where
multiple users of the same crypto transform may clobber each
other's results.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Harald Freudenberger (3):
crypto: s390 - fix concurrency issue in aes-ctr mode
crypto: s390 - fix des and des3_ede cbc concurrency issue
crypto: s390 - fix des and des3_ede ctr concurrency issue
arch/s390/crypto/aes_s390.c | 65 +++++++++++++++++++++---------
arch/s390/crypto/des_s390.c | 95 ++++++++++++++++++++++++++++---------------
2 files changed, 108 insertions(+), 52 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a potential boot crash on bcm2835 due to the
recent change that now causes hardware RNGs to be accessed on
registration.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Matt Porter (1):
hwrng: bcm2835 - fix oops when rng h/w is accessed during registration
drivers/char/hw_random/bcm2835-rng.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a NULL pointer dereference on allocation failure
in caam, as well as a regression in the ctr mode on s390 that was
added with the recent concurrency fixes.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Harald Freudenberger (1):
crypto: s390 - fix aes,des ctr mode concurrency finding.
Horia Geanta (1):
crypto: caam - add allocation failure handling in SPRINTFCAT macro
arch/s390/crypto/aes_s390.c | 3 +++
arch/s390/crypto/des_s390.c | 3 +++
drivers/crypto/caam/error.c | 10 +++++++---
3 files changed, 13 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a NULL pointer dereference on allocation failure
in caam, as well as a regression in the ctr mode on s390 that was
added with the recent concurrency fixes.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Harald Freudenberger (1):
crypto: s390 - fix aes,des ctr mode concurrency finding.
Horia Geanta (1):
crypto: caam - add allocation failure handling in SPRINTFCAT macro
arch/s390/crypto/aes_s390.c | 3 +++
arch/s390/crypto/des_s390.c | 3 +++
drivers/crypto/caam/error.c | 10 +++++++---
3 files changed, 13 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes an error in sha512_ssse3 that leads to incorrect
output as well as a memory leak in caam_jr when the module is
unloaded.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Cristian Stoica (1):
crypto: caam - fix memleak in caam_jr module
Jussi Kivilinna (1):
crypto: sha512_ssse3 - fix byte count to bit count conversion
arch/x86/crypto/sha512_ssse3_glue.c | 2 +-
drivers/crypto/caam/jr.c | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a boot hang in virt guests when the virtio RNG
is enabled.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Amit Shah (2):
hwrng: fetch randomness only after device init
hwrng: virtio - ensure reads happen after successful probe
drivers/char/hw_random/core.c | 47 +++++++++++++++++++++++++++++------
drivers/char/hw_random/virtio-rng.c | 10 ++++++++
2 files changed, 49 insertions(+), 8 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a regression on ARM where odd-sized blocks supplied
to AES may cause crashes.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Mikulas Patocka (2):
crypto: arm64-aes - fix encryption of unaligned data
crypto: arm-aes - fix encryption of unaligned data
arch/arm/crypto/aesbs-glue.c | 10 +++++-----
arch/arm64/crypto/aes-glue.c | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push adds missing SELinux labeling to AF_ALG sockets which
apparently causes SELinux (or at least the SELinux people) to
misbehave :)
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Milan Broz (1):
crypto: af_alg - properly label AF_ALG socket
crypto/af_alg.c | 2 ++
1 file changed, 2 insertions(+)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes the newly added drbg generator so that it actually
works on 32-bit machines. Previously the code was only tested on
64-bit and on 32-bit it overflowed and simply doesn't work.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Herbert Xu (1):
crypto: drbg - backport "fix maximum value checks on 32 bit systems"
Stephan Mueller (1):
crypto: drbg - remove check for uninitialized DRBG handle
crypto/drbg.c | 3 ---
include/crypto/drbg.h | 13 +++++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes three issues:
* If ccp is loaded on a machine without ccp, it will incorrectly
activate causing all requests to fail. Fixed by preventing ccp
from loading if hardware isn't available.
* Not all IRQs were enabled for the qat driver, leading to potential
stalls when it is used.
* Disabled buggy AVX CTR implementation in aesni.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Mathias Krause (1):
crypto: aesni - disable "by8" AVX CTR optimization
Tadeusz Struk (1):
crypto: qat - Enable all 32 IRQs
Tom Lendacky (1):
crypto: ccp - Check for CCP before registering crypto algs
arch/x86/crypto/aesni-intel_glue.c | 4 ++--
drivers/crypto/ccp/ccp-crypto-main.c | 4 ++++
drivers/crypto/ccp/ccp-dev.c | 14 ++++++++++++++
drivers/crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 2 +-
include/linux/ccp.h | 12 ++++++++++++
5 files changed, 33 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes these issues:
* Stack corruption in pseries hwrng driver.
* Missing DMA unmap in caam crypto driver.
* NUMA crash in qat crypto driver.
* Buggy mapping of zero-length associated data in qat crypto driver.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Cristian Stoica (1):
crypto: caam - fix missing dma unmap on error path
Greg Kurz (1):
hwrng: pseries - port to new read API and fix stack corruption
Tadeusz Struk (2):
crypto: qat - Prevent dma mapping zero length assoc data
crypto: qat - Enforce valid numa configuration
drivers/char/hw_random/pseries-rng.c | 11 ++++---
drivers/crypto/caam/key_gen.c | 29 +++++++++----------
drivers/crypto/qat/qat_common/adf_accel_devices.h | 3 +-
drivers/crypto/qat/qat_common/adf_transport.c | 12 ++++----
drivers/crypto/qat/qat_common/qat_algs.c | 7 +++--
drivers/crypto/qat/qat_common/qat_crypto.c | 8 ++++--
drivers/crypto/qat/qat_dh895xcc/adf_admin.c | 2 +-
drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 32 ++++++++-------------
drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 2 +-
9 files changed, 53 insertions(+), 53 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a use-after-free crash in the user-space crypto
API.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Rabin Vincent (1):
crypto: af_alg - fix backlog handling
crypto/af_alg.c | 3 +++
1 file changed, 3 insertions(+)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a build problem with sha-mb with old toolchains
and an implementation bug in the ctr(aes)/by8 branch of aesni-intel
that's enabled when AVX is available.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Mathias Krause (1):
crypto: aesni - fix "by8" variant for 128 bit keys
Vinson Lee (1):
crypto: sha-mb - Add avx2_supported check.
arch/x86/crypto/Makefile | 2 +-
arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 46 +++++++++++++++++++++++--------
2 files changed, 36 insertions(+), 12 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a regression that arose from the change to add
a crypto prefix to module names which was done to prevent the
loading of arbitrary modules through the Crypto API. In particular,
a number of modules were missing the crypto prefix which meant
that they could no longer be autoloaded.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Mathias Krause (1):
crypto: add missing crypto module aliases
arch/powerpc/crypto/sha1.c | 1 +
arch/x86/crypto/sha-mb/sha1_mb.c | 2 +-
crypto/aes_generic.c | 1 +
crypto/ansi_cprng.c | 1 +
crypto/blowfish_generic.c | 1 +
crypto/camellia_generic.c | 1 +
crypto/cast5_generic.c | 1 +
crypto/cast6_generic.c | 1 +
crypto/crc32c_generic.c | 1 +
crypto/crct10dif_generic.c | 1 +
crypto/des_generic.c | 7 ++++---
crypto/ghash-generic.c | 1 +
crypto/krng.c | 1 +
crypto/salsa20_generic.c | 1 +
crypto/serpent_generic.c | 1 +
crypto/sha1_generic.c | 1 +
crypto/sha256_generic.c | 2 ++
crypto/sha512_generic.c | 2 ++
crypto/tea.c | 1 +
crypto/tgr192.c | 1 +
crypto/twofish_generic.c | 1 +
crypto/wp512.c | 1 +
22 files changed, 27 insertions(+), 4 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a bug in the ARM XTS implementation that can
cause failures to in decrypting encrypted disks.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Ard Biesheuvel (1):
crypto: arm/aes update NEON AES module to latest OpenSSL version
arch/arm/crypto/aesbs-core.S_shipped | 12 ++++++++----
arch/arm/crypto/bsaes-armv7.pl | 12 ++++++++----
2 files changed, 16 insertions(+), 8 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
On Mon, Mar 09, 2015 at 04:19:50PM +1100, Herbert Xu wrote:
>
> This push fixes a bug in the ARM XTS implementation that can
> cause failures to in decrypting encrypted disks.
For some reason this didn't get pulled so I'm resending it with
another fix.
The new fix is a memory overwrite bug that can cause a crash
which can be triggered from userspace.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Ard Biesheuvel (1):
crypto: arm/aes update NEON AES module to latest OpenSSL version
Stephan Mueller (1):
crypto: aesni - fix memory usage in GCM decryption
arch/arm/crypto/aesbs-core.S_shipped | 12 ++++++++----
arch/arm/crypto/bsaes-armv7.pl | 12 ++++++++----
arch/x86/crypto/aesni-intel_glue.c | 4 ++--
3 files changed, 18 insertions(+), 10 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Tue, Mar 17, 2015 at 10:25 PM, Herbert Xu
<[email protected]> wrote:
> Hi Linus:
>
> On Mon, Mar 09, 2015 at 04:19:50PM +1100, Herbert Xu wrote:
>>
>> This push fixes a bug in the ARM XTS implementation that can
>> cause failures to in decrypting encrypted disks.
>
> For some reason this didn't get pulled so I'm resending it with
> another fix.
Hmm. I never got your original email. Maybe it was in my spam folder
and my spam scan never noticed..
Linus
Hi Linus:
This push fixes a build problem with img-hash under non-standard
configurations and a serious regression with sha512_ssse3 which can
lead to boot failures.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Ard Biesheuvel (1):
crypto: x86/sha512_ssse3 - fixup for asm function prototype change
Geert Uytterhoeven (1):
crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA
arch/x86/crypto/sha512-avx2-asm.S | 2 +-
drivers/crypto/Kconfig | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a build problem with bcm63xx and yet another fix
to the memzero_explicit function to ensure that the memset is not
elided.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Daniel Borkmann (1):
lib: make memzero_explicit more robust against dead store elimination
?lvaro Fern?ndez Rojas (1):
hwrng: bcm63xx - Fix driver compilation
drivers/char/hw_random/bcm63xx-rng.c | 18 +++++++++---------
include/linux/compiler-gcc.h | 16 +++++++++++++++-
include/linux/compiler-intel.h | 3 +++
include/linux/compiler.h | 4 ++++
lib/string.c | 2 +-
5 files changed, 32 insertions(+), 11 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a the implementation of CRC32 on arm64 where it
incorrectly applied negation on the result. It also fixes the
arm64 implementations of SHA/SHA256 where in some cases it may
end up finalising the result twice.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Ard Biesheuvel (3):
crypto: arm64/crc32 - bring in line with generic CRC32
crypto: arm64/sha1-ce - prevent asm code finalization in final() path
crypto: arm64/sha2-ce - prevent asm code finalization in final() path
arch/arm64/crypto/crc32-arm64.c | 22 +++++++++++++++++++---
arch/arm64/crypto/sha1-ce-glue.c | 3 +++
arch/arm64/crypto/sha2-ce-glue.c | 3 +++
3 files changed, 25 insertions(+), 3 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes a the crash in the newly added algif_aead interface
when it tries to link SG lists.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Tadeusz Struk (1):
crypto: algif_aead - fix invalid sgl linking
crypto/algif_aead.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes the following issues:
* Crash in the newly added algif_aead interface when it tries to
link SG lists.
* ICV corruption in s390/ghash when the same tfm is used by more
than one thread.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
or
master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Harald Freudenberger (1):
crypto: s390/ghash - Fix incorrect ghash icv buffer handling.
Tadeusz Struk (1):
crypto: algif_aead - fix invalid sgl linking
arch/s390/crypto/ghash_s390.c | 25 +++++++++++++------------
crypto/algif_aead.c | 9 ++++-----
2 files changed, 17 insertions(+), 17 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Thu, May 21, 2015 at 9:05 PM, Herbert Xu <[email protected]> wrote:
>
> Please pull from
>
> git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
>
> or
>
> master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Mind fixing your script to not have that old "master.kernel.org' thing
that no longer works and hasn't worked in a long time? I thought I
asked you earlier, but it turns out that was Dmitry and the input tree
who had the same old script...
Linus
On Fri, May 22, 2015 at 02:29:11PM -0700, Linus Torvalds wrote:
> On Thu, May 21, 2015 at 9:05 PM, Herbert Xu <[email protected]> wrote:
> >
> > Please pull from
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
> >
> > or
> >
> > master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
>
> Mind fixing your script to not have that old "master.kernel.org' thing
> that no longer works and hasn't worked in a long time? I thought I
> asked you earlier, but it turns out that was Dmitry and the input tree
> who had the same old script...
Sure I'll get rid of it.
Cheers,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push disables the newly (4.1) added user-space AEAD interface
so that we can fix issues in the underlying kernel AEAD interface.
Once the new kernel AEAD interface is ready we can then reenable
the user-space AEAD interface.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Herbert Xu (1):
crypto: algif_aead - Disable AEAD user-space for now
crypto/Kconfig | 9 ---------
1 file changed, 9 deletions(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Hi Linus:
This push fixes the following issues:
1) Crash in caam hash due to uninitialised buffer lengths.
2) Alignment issue in caam RNG that may lead to non-random output.
Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
Steve Cornelius (2):
crypto: caam - improve initalization for context state saves
crypto: caam - fix RNG buffer cache alignment
drivers/crypto/caam/caamhash.c | 2 ++
drivers/crypto/caam/caamrng.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt