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

Commit b46f6ded authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

libnl: nla_put_be64(): align on a 64-bit area 



nla_data() is now aligned on a 64-bit area.

A temporary version (nla_put_be64_32bit()) is added for nla_put_net64().
This function is removed in the next patch.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7479122

include/net/netlink.h

+11 −4
Original line number Diff line number Diff line
@@ -856,16 +856,23 @@ static inline int nla_put_u64(struct sk_buff *skb, int attrtype, u64 value) 
}



/**

 * nla_put_be64 - Add a __be64 netlink attribute to a socket buffer

 * nla_put_be64 - Add a __be64 netlink attribute to a socket buffer and align it

 * @skb: socket buffer to add attribute to

 * @attrtype: attribute type

 * @value: numeric value

 * @padattr: attribute type for the padding

 */

static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value)

static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value,

			       int padattr)

{

	return nla_put(skb, attrtype, sizeof(__be64), &value);

	return nla_put_64bit(skb, attrtype, sizeof(__be64), &value, padattr);

}



static inline int nla_put_be64_32bit(struct sk_buff *skb, int attrtype,

				     __be64 value)

{

	return nla_put(skb, attrtype, sizeof(__be64), &value);

}

/**

 * nla_put_net64 - Add 64-bit network byte order netlink attribute to a socket buffer

 * @skb: socket buffer to add attribute to
@@ -874,7 +881,7 @@ static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value) 
 */

static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value)

{

	return nla_put_be64(skb, attrtype | NLA_F_NET_BYTEORDER, value);

	return nla_put_be64_32bit(skb, attrtype | NLA_F_NET_BYTEORDER, value);

}



/**

include/uapi/linux/fib_rules.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ enum { 
	FRA_TABLE,	/* Extended table id */

	FRA_FWMASK,	/* mask for netfilter mark */

	FRA_OIFNAME,

	FRA_PAD,

	__FRA_MAX

};

include/uapi/linux/lwtunnel.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ enum lwtunnel_ip_t { 
	LWTUNNEL_IP_TTL,

	LWTUNNEL_IP_TOS,

	LWTUNNEL_IP_FLAGS,

	LWTUNNEL_IP_PAD,

	__LWTUNNEL_IP_MAX,

};
@@ -35,6 +36,7 @@ enum lwtunnel_ip6_t { 
	LWTUNNEL_IP6_HOPLIMIT,

	LWTUNNEL_IP6_TC,

	LWTUNNEL_IP6_FLAGS,

	LWTUNNEL_IP6_PAD,

	__LWTUNNEL_IP6_MAX,

};

include/uapi/linux/netfilter/nf_tables.h

+8 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ enum nft_chain_attributes { 
	NFTA_CHAIN_USE,

	NFTA_CHAIN_TYPE,

	NFTA_CHAIN_COUNTERS,

	NFTA_CHAIN_PAD,

	__NFTA_CHAIN_MAX

};

#define NFTA_CHAIN_MAX		(__NFTA_CHAIN_MAX - 1)
@@ -206,6 +207,7 @@ enum nft_rule_attributes { 
	NFTA_RULE_COMPAT,

	NFTA_RULE_POSITION,

	NFTA_RULE_USERDATA,

	NFTA_RULE_PAD,

	__NFTA_RULE_MAX

};

#define NFTA_RULE_MAX		(__NFTA_RULE_MAX - 1)
@@ -308,6 +310,7 @@ enum nft_set_attributes { 
	NFTA_SET_TIMEOUT,

	NFTA_SET_GC_INTERVAL,

	NFTA_SET_USERDATA,

	NFTA_SET_PAD,

	__NFTA_SET_MAX

};

#define NFTA_SET_MAX		(__NFTA_SET_MAX - 1)
@@ -341,6 +344,7 @@ enum nft_set_elem_attributes { 
	NFTA_SET_ELEM_EXPIRATION,

	NFTA_SET_ELEM_USERDATA,

	NFTA_SET_ELEM_EXPR,

	NFTA_SET_ELEM_PAD,

	__NFTA_SET_ELEM_MAX

};

#define NFTA_SET_ELEM_MAX	(__NFTA_SET_ELEM_MAX - 1)
@@ -584,6 +588,7 @@ enum nft_dynset_attributes { 
	NFTA_DYNSET_SREG_DATA,

	NFTA_DYNSET_TIMEOUT,

	NFTA_DYNSET_EXPR,

	NFTA_DYNSET_PAD,

	__NFTA_DYNSET_MAX,

};

#define NFTA_DYNSET_MAX		(__NFTA_DYNSET_MAX - 1)
@@ -806,6 +811,7 @@ enum nft_limit_attributes { 
	NFTA_LIMIT_BURST,

	NFTA_LIMIT_TYPE,

	NFTA_LIMIT_FLAGS,

	NFTA_LIMIT_PAD,

	__NFTA_LIMIT_MAX

};

#define NFTA_LIMIT_MAX		(__NFTA_LIMIT_MAX - 1)
@@ -820,6 +826,7 @@ enum nft_counter_attributes { 
	NFTA_COUNTER_UNSPEC,

	NFTA_COUNTER_BYTES,

	NFTA_COUNTER_PACKETS,

	NFTA_COUNTER_PAD,

	__NFTA_COUNTER_MAX

};

#define NFTA_COUNTER_MAX	(__NFTA_COUNTER_MAX - 1)
@@ -1055,6 +1062,7 @@ enum nft_trace_attibutes { 
	NFTA_TRACE_MARK,

	NFTA_TRACE_NFPROTO,

	NFTA_TRACE_POLICY,

	NFTA_TRACE_PAD,

	__NFTA_TRACE_MAX

};

#define NFTA_TRACE_MAX (__NFTA_TRACE_MAX - 1)

include/uapi/linux/netfilter/nfnetlink_acct.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ enum nfnl_acct_type { 
	NFACCT_FLAGS,

	NFACCT_QUOTA,

	NFACCT_FILTER,

	NFACCT_PAD,

	__NFACCT_MAX

};

#define NFACCT_MAX (__NFACCT_MAX - 1)