tipc: fix the big/little endian issue in tipc_dest
In function tipc_dest_push, the 32bit variables 'node' and 'port' are stored separately in uppper and lower part of 64bit 'value'. Then this value is assigned to dst->value which is a union like: union { struct { u32 port; u32 node; }; u64 value; } This works on little-endian machines like x86 but fails on big-endian machines. The fix remove the 'value' stack parameter and even the 'value' member of the union in tipc_dest, assign the 'node' and 'port' member directly with the input parameter to avoid the endian issue. Fixes: a80ae5306a73 ("tipc: improve destination linked list") Signed-off-by: Zhenbo Gao <zhenbo.gao@windriver.com> Acked-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: Haiqing Bai <Haiqing.Bai@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ca2b1d2d42
commit
30935198b7
@ -980,20 +980,17 @@ int tipc_nl_name_table_dump(struct sk_buff *skb, struct netlink_callback *cb)
|
||||
|
||||
struct tipc_dest *tipc_dest_find(struct list_head *l, u32 node, u32 port)
|
||||
{
|
||||
u64 value = (u64)node << 32 | port;
|
||||
struct tipc_dest *dst;
|
||||
|
||||
list_for_each_entry(dst, l, list) {
|
||||
if (dst->value != value)
|
||||
continue;
|
||||
return dst;
|
||||
if (dst->node == node && dst->port == port)
|
||||
return dst;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool tipc_dest_push(struct list_head *l, u32 node, u32 port)
|
||||
{
|
||||
u64 value = (u64)node << 32 | port;
|
||||
struct tipc_dest *dst;
|
||||
|
||||
if (tipc_dest_find(l, node, port))
|
||||
@ -1002,7 +999,8 @@ bool tipc_dest_push(struct list_head *l, u32 node, u32 port)
|
||||
dst = kmalloc(sizeof(*dst), GFP_ATOMIC);
|
||||
if (unlikely(!dst))
|
||||
return false;
|
||||
dst->value = value;
|
||||
dst->node = node;
|
||||
dst->port = port;
|
||||
list_add(&dst->list, l);
|
||||
return true;
|
||||
}
|
||||
|
@ -133,13 +133,8 @@ void tipc_nametbl_stop(struct net *net);
|
||||
|
||||
struct tipc_dest {
|
||||
struct list_head list;
|
||||
union {
|
||||
struct {
|
||||
u32 port;
|
||||
u32 node;
|
||||
};
|
||||
u64 value;
|
||||
};
|
||||
u32 port;
|
||||
u32 node;
|
||||
};
|
||||
|
||||
struct tipc_dest *tipc_dest_find(struct list_head *l, u32 node, u32 port);
|
||||
|
Loading…
x
Reference in New Issue
Block a user