提交 30935198 编写于 作者: H Haiqing Bai 提交者: David S. Miller

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: a80ae530 ("tipc: improve destination linked list")
Signed-off-by: NZhenbo Gao <zhenbo.gao@windriver.com>
Acked-by: NJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: NHaiqing Bai <Haiqing.Bai@windriver.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 ca2b1d2d
...@@ -980,20 +980,17 @@ int tipc_nl_name_table_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -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) struct tipc_dest *tipc_dest_find(struct list_head *l, u32 node, u32 port)
{ {
u64 value = (u64)node << 32 | port;
struct tipc_dest *dst; struct tipc_dest *dst;
list_for_each_entry(dst, l, list) { list_for_each_entry(dst, l, list) {
if (dst->value != value) if (dst->node == node && dst->port == port)
continue; return dst;
return dst;
} }
return NULL; return NULL;
} }
bool tipc_dest_push(struct list_head *l, u32 node, u32 port) bool tipc_dest_push(struct list_head *l, u32 node, u32 port)
{ {
u64 value = (u64)node << 32 | port;
struct tipc_dest *dst; struct tipc_dest *dst;
if (tipc_dest_find(l, node, port)) if (tipc_dest_find(l, node, port))
...@@ -1002,7 +999,8 @@ bool tipc_dest_push(struct list_head *l, u32 node, u32 port) ...@@ -1002,7 +999,8 @@ bool tipc_dest_push(struct list_head *l, u32 node, u32 port)
dst = kmalloc(sizeof(*dst), GFP_ATOMIC); dst = kmalloc(sizeof(*dst), GFP_ATOMIC);
if (unlikely(!dst)) if (unlikely(!dst))
return false; return false;
dst->value = value; dst->node = node;
dst->port = port;
list_add(&dst->list, l); list_add(&dst->list, l);
return true; return true;
} }
......
...@@ -133,13 +133,8 @@ void tipc_nametbl_stop(struct net *net); ...@@ -133,13 +133,8 @@ void tipc_nametbl_stop(struct net *net);
struct tipc_dest { struct tipc_dest {
struct list_head list; struct list_head list;
union { u32 port;
struct { u32 node;
u32 port;
u32 node;
};
u64 value;
};
}; };
struct tipc_dest *tipc_dest_find(struct list_head *l, u32 node, u32 port); struct tipc_dest *tipc_dest_find(struct list_head *l, u32 node, u32 port);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册