[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Wed, 02 Mar 2011 22:19:51 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: dhowells@...hat.com
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
anton@...ba.org
Subject: Re: [PATCH] RxRPC: Fix v1 keys
From: David Howells <dhowells@...hat.com>
Date: Mon, 28 Feb 2011 13:27:53 +0000
> From: Anton Blanchard <anton@....ibm.com>
>
> commit 339412841d7 (RxRPC: Allow key payloads to be passed in XDR form)
> broke klog for me. I notice the v1 key struct had a kif_version field
> added:
>
> -struct rxkad_key {
> - u16 security_index; /* RxRPC header security index */
> - u16 ticket_len; /* length of ticket[] */
> - u32 expiry; /* time at which expires */
> - u32 kvno; /* key version number */
> - u8 session_key[8]; /* DES session key */
> - u8 ticket[0]; /* the encrypted ticket */
> -};
>
> +struct rxrpc_key_data_v1 {
> + u32 kif_version; /* 1 */
> + u16 security_index;
> + u16 ticket_length;
> + u32 expiry; /* time_t */
> + u32 kvno;
> + u8 session_key[8];
> + u8 ticket[0];
> +};
>
> However the code in rxrpc_instantiate strips it away:
>
> data += sizeof(kver);
> datalen -= sizeof(kver);
>
> Removing kif_version fixes my problem.
>
> Signed-off-by: Anton Blanchard <anton@...ba.org>
> Signed-off-by: David Howells <dhowells@...hat.com>
Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists