| Message ID | 20171107221527.98433-1-ebiggers3@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
Eric Biggers <ebiggers3@gmail.com> wrote: > On a non-preemptible kernel, if KEYCTL_DH_COMPUTE is called with the > largest permitted inputs (16384 bits), the kernel spends 10+ seconds > doing modular exponentiation in mpi_powm() without rescheduling. If all > threads do it, it locks up the system. Moreover, it can cause > rcu_sched-stall warnings. Do you want this to go in immediately, or I should I push it to James for the next merge window? David
Hi David, On Wed, Nov 08, 2017 at 12:50:17PM +0000, David Howells wrote: > Eric Biggers <ebiggers3@gmail.com> wrote: > > > On a non-preemptible kernel, if KEYCTL_DH_COMPUTE is called with the > > largest permitted inputs (16384 bits), the kernel spends 10+ seconds > > doing modular exponentiation in mpi_powm() without rescheduling. If all > > threads do it, it locks up the system. Moreover, it can cause > > rcu_sched-stall warnings. > > Do you want this to go in immediately, or I should I push it to James for the > next merge window? > > David This probably should be grouped with my series "crypto: dh - input validation fixes", as this is also a fix for Diffie-Hellman. I was actually expecting Herbert Xu to take these patches, as Diffie-Hellman is now part of the crypto API (crypto/dh.c); none of the patches actually touch security/keys/. If you'd like to maintain the Diffie-Hellman implementation(s) you should get yourself added to MAINTAINERS for the relevant files. As for the criticality of the fixes, the code is new in v4.12, so I doubt many people have CONFIG_KEY_DH_OPERATIONS=y enabled yet. syzbot doesn't actually have it enabled either (we should turn it on); I just happened to find these bugs by running syzkaller myself. So it may not be particularly critical to take these fixes immediately. However, at least the fix for the double free bug ("crypto: dh - Fix double free of ctx->p") shouldn't wait for too long... Eric
Eric Biggers <ebiggers3@gmail.com> wrote: > This probably should be grouped with my series "crypto: dh - input validation > fixes", as this is also a fix for Diffie-Hellman. I was actually expecting > Herbert Xu to take these patches, as Diffie-Hellman is now part of the crypto > API (crypto/dh.c); none of the patches actually touch security/keys/. Fine by me. > If you'd like to maintain the Diffie-Hellman implementation(s) you should > get yourself added to MAINTAINERS for the relevant files. It touches the MPI lib, though, so it also potentially affects RSA and stuff, which is why I introduced it to the kernel originally. David
On Wed, Nov 08, 2017 at 08:17:12PM +0000, David Howells wrote: > Eric Biggers <ebiggers3@gmail.com> wrote: > > > This probably should be grouped with my series "crypto: dh - input validation > > fixes", as this is also a fix for Diffie-Hellman. I was actually expecting > > Herbert Xu to take these patches, as Diffie-Hellman is now part of the crypto > > API (crypto/dh.c); none of the patches actually touch security/keys/. > > Fine by me. > > > If you'd like to maintain the Diffie-Hellman implementation(s) you should > > get yourself added to MAINTAINERS for the relevant files. > > It touches the MPI lib, though, so it also potentially affects RSA and stuff, > which is why I introduced it to the kernel originally. > True, mpi_powm() might also be reachable by adding a key of type "asymmetric", in which case this fix would need to go to older kernels than v4.12. If I have a chance I'll see if I can find a reproducer. Eric
On Wed, 8 Nov 2017, Eric Biggers wrote: > On Wed, Nov 08, 2017 at 08:17:12PM +0000, David Howells wrote: >> Eric Biggers <ebiggers3@gmail.com> wrote: >> >>> This probably should be grouped with my series "crypto: dh - input validation >>> fixes", as this is also a fix for Diffie-Hellman. I was actually expecting >>> Herbert Xu to take these patches, as Diffie-Hellman is now part of the crypto >>> API (crypto/dh.c); none of the patches actually touch security/keys/. >> >> Fine by me. >> >>> If you'd like to maintain the Diffie-Hellman implementation(s) you should >>> get yourself added to MAINTAINERS for the relevant files. >> >> It touches the MPI lib, though, so it also potentially affects RSA and stuff, >> which is why I introduced it to the kernel originally. >> > > True, mpi_powm() might also be reachable by adding a key of type "asymmetric", > in which case this fix would need to go to older kernels than v4.12. If I have > a chance I'll see if I can find a reproducer. CONFIG_KEY_DH_OPERATIONS and use of mpi_powm() by KEYCTL_DH_COMPUTE goes back to v4.7, when the MPI library was called directly. KPP was not implemented yet. -- Mat Martineau Intel OTC
diff --git a/lib/mpi/mpi-pow.c b/lib/mpi/mpi-pow.c index e24388a863a7..468fb7cd1221 100644 --- a/lib/mpi/mpi-pow.c +++ b/lib/mpi/mpi-pow.c @@ -26,6 +26,7 @@ * however I decided to publish this code under the plain GPL. */ +#include <linux/sched.h> #include <linux/string.h> #include "mpi-internal.h" #include "longlong.h" @@ -256,6 +257,7 @@ int mpi_powm(MPI res, MPI base, MPI exp, MPI mod) } e <<= 1; c--; + cond_resched(); } i--;