1 files changed, 13 insertions, 7 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c
index 42560e55d978..88cd24aacddc 100644
--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c
+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c
@@ -201,9 +201,15 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,
 
         msg_start = ptr + GSS_KRB5_TOK_HDR_LEN + kctx->gk5e->cksumlength;
 
-        *(__be16 *)(ptr + 2) = cpu_to_le16(kctx->gk5e->signalg);
-        memset(ptr + 4, 0xff, 4);
-        *(__be16 *)(ptr + 4) = cpu_to_le16(kctx->gk5e->sealalg);
+        /*
+         * signalg and sealalg are stored as if they were converted from LE
+         * to host endian, even though they're opaque pairs of bytes according
+         * to the RFC.
+         */
+        *(__le16 *)(ptr + 2) = cpu_to_le16(kctx->gk5e->signalg);
+        *(__le16 *)(ptr + 4) = cpu_to_le16(kctx->gk5e->sealalg);
+        ptr[6] = 0xff;
+        ptr[7] = 0xff;
 
         gss_krb5_make_confounder(msg_start, conflen);
 
@@ -438,7 +444,7 @@ gss_wrap_kerberos_v2(struct krb5_ctx *kctx, u32 offset,
         u8              *ptr, *plainhdr;
         s32             now;
         u8              flags = 0x00;
-        __be16          *be16ptr, ec = 0;
+        __be16          *be16ptr;
         __be64          *be64ptr;
         u32             err;
 
@@ -468,16 +474,16 @@ gss_wrap_kerberos_v2(struct krb5_ctx *kctx, u32 offset,
         be16ptr = (__be16 *)ptr;
 
         blocksize = crypto_blkcipher_blocksize(kctx->acceptor_enc);
-        *be16ptr++ = cpu_to_be16(ec);
+        *be16ptr++ = 0;
         /* "inner" token header always uses 0 for RRC */
-        *be16ptr++ = cpu_to_be16(0);
+        *be16ptr++ = 0;
 
         be64ptr = (__be64 *)be16ptr;
         spin_lock(&krb5_seq_lock);
         *be64ptr = cpu_to_be64(kctx->seq_send64++);
         spin_unlock(&krb5_seq_lock);
 
-        err = (*kctx->gk5e->encrypt_v2)(kctx, offset, buf, ec, pages);
+        err = (*kctx->gk5e->encrypt_v2)(kctx, offset, buf, 0, pages);
         if (err)
                 return err;