Re: [PATCH 2/5] netlink: store MSG_CMSG_COMPAT flag in netlink_skb_parms

[Johannes Berg <johannes@sipsolutions.net>]

[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]

On Fri, 2010-02-19 at 13:41 +0100, Florian Westphal wrote:
> From: Florian Westphal <fw@strlen.de>
> 
> This allows the netlink processing context to determine if the data
> needs any 32 bit fixups.
> 
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
>  changes since v1: change msg_compat to bool.
> 
>  include/linux/netlink.h  |    1 +
>  net/netlink/af_netlink.c |    3 +++
>  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/include/linux/netlink.h b/include/linux/netlink.h
> index fde27c0..c094694 100644
> --- a/include/linux/netlink.h
> +++ b/include/linux/netlink.h
> @@ -164,6 +164,7 @@ struct netlink_skb_parms {
>  	__u32			loginuid;	/* Login (audit) uid */
>  	__u32			sessionid;	/* Session id (audit) */
>  	__u32			sid;		/* SELinux security id */
> +	bool			msg_compat;	/* Message needs 32bit fixups */
>  };
>  
>  #define NETLINK_CB(skb)		(*(struct netlink_skb_parms*)&((skb)->cb))
> diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
> index 4910031..5ff97cf 100644
> --- a/net/netlink/af_netlink.c
> +++ b/net/netlink/af_netlink.c
> @@ -1328,6 +1328,9 @@ static int netlink_sendmsg(struct kiocb *kiocb,
> struct socket *sock,
>  	NETLINK_CB(skb).dst_group = dst_group;
>  	NETLINK_CB(skb).loginuid = audit_get_loginuid(current);
>  	NETLINK_CB(skb).sessionid = audit_get_sessionid(current);
> +#ifdef CONFIG_COMPAT_NETLINK_MESSAGES
> +	NETLINK_CB(skb).msg_compat = !!(msg->msg_flags & MSG_CMSG_COMPAT);
> +#endif

Can't really decide ... does that ifdef make sense? Or should the
variable be ifdef'ed as well?

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]