From patchwork Thu Dec 6 08:43:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [net-next,0/7] Allow to monitor multicast cache event via rtnetlink From: Nicolas Dichtel X-Patchwork-Id: 204175 Message-Id: <50C05AC2.1050504@6wind.com> To: David Miller Cc: David.Laight@ACULAB.COM, netdev@vger.kernel.org Date: Thu, 06 Dec 2012 09:43:46 +0100 Le 05/12/2012 18:54, David Miller a écrit : > From: "David Laight" > Date: Wed, 5 Dec 2012 11:41:33 -0000 > >> Probably worth commenting that the 64bit items might only be 32bit aligned. >> Just to stop anyone trying to read/write them with pointer casts. > > Rather, let's not create this situation at all. > > It's totally inappropriate to have special code to handle every single > time we want to put 64-bit values into netlink messages. > > We need a real solution to this issue. > The easiest way is to update *_ALIGNTO values (maybe we can keep NLMSG_ALIGNTO to 4). But I think that many userland apps have these values hardcoded and, the most important thing, this may increase size of many netlink messages. Hence we need probably to find something better. --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/uapi/linux/netfilter/nfnetlink_compat.h b/include/uapi/linux/netfilter/nfnetlink_compat.h index ffb9503..121e62a 100644 --- a/include/uapi/linux/netfilter/nfnetlink_compat.h +++ b/include/uapi/linux/netfilter/nfnetlink_compat.h @@ -33,7 +33,7 @@ struct nfattr { #define NFNL_NFA_NEST 0x8000 #define NFA_TYPE(attr) ((attr)->nfa_type & 0x7fff) -#define NFA_ALIGNTO 4 +#define NFA_ALIGNTO 8 #define NFA_ALIGN(len) (((len) + NFA_ALIGNTO - 1) & ~(NFA_ALIGNTO - 1)) #define NFA_OK(nfa,len) ((len) > 0 && (nfa)->nfa_len >= sizeof(struct nfattr) \ && (nfa)->nfa_len <= (len)) diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index 78d5b8a..66d2a26 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h @@ -75,7 +75,7 @@ struct nlmsghdr { Check NLM_F_EXCL */ -#define NLMSG_ALIGNTO 4U +#define NLMSG_ALIGNTO 8U #define NLMSG_ALIGN(len) ( ((len)+NLMSG_ALIGNTO-1) & ~(NLMSG_ALIGNTO-1) ) #define NLMSG_HDRLEN ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr))) #define NLMSG_LENGTH(len) ((len)+NLMSG_ALIGN(NLMSG_HDRLEN)) @@ -145,7 +145,7 @@ struct nlattr { #define NLA_F_NET_BYTEORDER (1 << 14) #define NLA_TYPE_MASK ~(NLA_F_NESTED | NLA_F_NET_BYTEORDER) -#define NLA_ALIGNTO 4 +#define NLA_ALIGNTO 8 #define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1)) #define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr))) diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h index 33d29ce..ee898c1 100644 --- a/include/uapi/linux/rtnetlink.h +++ b/include/uapi/linux/rtnetlink.h @@ -146,7 +146,7 @@ struct rtattr { /* Macros to handle rtattributes */ -#define RTA_ALIGNTO 4 +#define RTA_ALIGNTO 8 #define RTA_ALIGN(len) ( ((len)+RTA_ALIGNTO-1) & ~(RTA_ALIGNTO-1) ) #define RTA_OK(rta,len) ((len) >= (int)sizeof(struct rtattr) && \ (rta)->rta_len >= sizeof(struct rtattr) && \ @@ -322,7 +322,7 @@ struct rtnexthop { /* Macros to handle hexthops */ -#define RTNH_ALIGNTO 4 +#define RTNH_ALIGNTO 8 #define RTNH_ALIGN(len) ( ((len)+RTNH_ALIGNTO-1) & ~(RTNH_ALIGNTO-1) ) #define RTNH_OK(rtnh,len) ((rtnh)->rtnh_len >= sizeof(struct rtnexthop) && \ ((int)(rtnh)->rtnh_len) <= (len))