Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac0fbbf authored by Jeff Layton's avatar Jeff Layton Committed by Trond Myklebust
Browse files

sunrpc: clean up sparse endianness warnings in gss_krb5_seal.c 



Use u16 pointer in setup_token and setup_token_v2. None of the fields
are actually handled as __be16, so this simplifies the code a bit. Also
get rid of some unneeded pointer increments.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent c5e6aecd

net/sunrpc/auth_gss/gss_krb5_seal.c

+17 −11
Original line number Diff line number Diff line
@@ -70,31 +70,37 @@ 


DEFINE_SPINLOCK(krb5_seq_lock);



static char *

static void *

setup_token(struct krb5_ctx *ctx, struct xdr_netobj *token)

{

	__be16 *ptr, *krb5_hdr;

	u16 *ptr;

	void *krb5_hdr;

	int body_size = GSS_KRB5_TOK_HDR_LEN + ctx->gk5e->cksumlength;



	token->len = g_token_size(&ctx->mech_used, body_size);



	ptr = (__be16 *)token->data;

	ptr = (u16 *)token->data;

	g_make_token_header(&ctx->mech_used, body_size, (unsigned char **)&ptr);



	/* ptr now at start of header described in rfc 1964, section 1.2.1: */

	krb5_hdr = ptr;

	*ptr++ = KG_TOK_MIC_MSG;

	*ptr++ = cpu_to_le16(ctx->gk5e->signalg);

	/*

	 * signalg is stored as if it were converted from LE to host endian, even

	 * though it's an opaque pair of bytes according to the RFC.

	 */

	*ptr++ = (__force u16)cpu_to_le16(ctx->gk5e->signalg);

	*ptr++ = SEAL_ALG_NONE;

	*ptr++ = 0xffff;

	*ptr = 0xffff;



	return (char *)krb5_hdr;

	return krb5_hdr;

}



static void *

setup_token_v2(struct krb5_ctx *ctx, struct xdr_netobj *token)

{

	__be16 *ptr, *krb5_hdr;

	u16 *ptr;

	void *krb5_hdr;

	u8 *p, flags = 0x00;



	if ((ctx->flags & KRB5_CTX_FLAG_INITIATOR) == 0)
@@ -104,15 +110,15 @@ setup_token_v2(struct krb5_ctx *ctx, struct xdr_netobj *token) 


	/* Per rfc 4121, sec 4.2.6.1, there is no header,

	 * just start the token */

	krb5_hdr = ptr = (__be16 *)token->data;

	krb5_hdr = ptr = (u16 *)token->data;



	*ptr++ = KG2_TOK_MIC;

	p = (u8 *)ptr;

	*p++ = flags;

	*p++ = 0xff;

	ptr = (__be16 *)p;

	*ptr++ = 0xffff;

	ptr = (u16 *)p;

	*ptr++ = 0xffff;

	*ptr = 0xffff;



	token->len = GSS_KRB5_TOK_HDR_LEN + ctx->gk5e->cksumlength;

	return krb5_hdr;
@@ -181,7 +187,7 @@ gss_get_mic_v2(struct krb5_ctx *ctx, struct xdr_buf *text, 
	spin_lock(&krb5_seq_lock);

	seq_send = ctx->seq_send64++;

	spin_unlock(&krb5_seq_lock);

	*((u64 *)(krb5_hdr + 8)) = cpu_to_be64(seq_send);

	*((__be64 *)(krb5_hdr + 8)) = cpu_to_be64(seq_send);



	if (ctx->initiate) {

		cksumkey = ctx->initiator_sign;