diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-06-10 04:59:07 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-10-12 15:28:06 +0100 |
| commit | 269bed5aa035e4e38fe91ba6502c3d908f6ffae6 (patch) | |
| tree | 4f9322efc6e929f23478cdb2fa3a1d5826b1fc66 | |
| parent | 5ceaff45fb7d526c6bab53c89cb740685dd960ce (diff) | |
| download | linux-stable-269bed5aa035e4e38fe91ba6502c3d908f6ffae6.tar.gz linux-stable-269bed5aa035e4e38fe91ba6502c3d908f6ffae6.tar.bz2 linux-stable-269bed5aa035e4e38fe91ba6502c3d908f6ffae6.zip | |
sunrpc: use constant time memory comparison for mac
commit 15a8b93fd5690de017ce665382ea45e5d61811a4 upstream.
Otherwise, we enable a MAC forgery via timing attack.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Jeff Layton <jlayton@poochiereds.net>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Anna Schumaker <anna.schumaker@netapp.com>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c index 0f43e894bc0a..4ff1a3486937 100644 --- a/net/sunrpc/auth_gss/gss_krb5_crypto.c +++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c @@ -34,6 +34,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include <crypto/algapi.h> #include <linux/err.h> #include <linux/types.h> #include <linux/mm.h> @@ -838,7 +839,7 @@ gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, struct xdr_buf *buf, if (ret) goto out_err; - if (memcmp(pkt_hmac, our_hmac, kctx->gk5e->cksumlength) != 0) { + if (crypto_memneq(pkt_hmac, our_hmac, kctx->gk5e->cksumlength) != 0) { ret = GSS_S_BAD_SIG; goto out_err; } |