Skip to content

Commit

Permalink
[TIPC]: Corrected potential misuse of tipc_media_addr structure.
Browse files Browse the repository at this point in the history
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Per Liden <per.liden@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Allan Stephens authored and David S. Miller committed Jun 26, 2006
1 parent 2535ec5 commit 4938450
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
12 changes: 10 additions & 2 deletions include/net/tipc/tipc_bearer.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,18 @@

#define TIPC_MEDIA_TYPE_ETH 1

/*
* Destination address structure used by TIPC bearers when sending messages
*
* IMPORTANT: The fields of this structure MUST be stored using the specified
* byte order indicated below, as the structure is exchanged between nodes
* as part of a link setup process.
*/

struct tipc_media_addr {
__u32 type;
__u32 type; /* bearer type (network byte order) */
union {
__u8 eth_addr[6]; /* Ethernet bearer */
__u8 eth_addr[6]; /* 48 bit Ethernet addr (byte array) */
#if 0
/* Prototypes for other possible bearer types */

Expand Down
4 changes: 3 additions & 1 deletion net/tipc/eth_media.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,9 @@ int tipc_eth_media_start(void)
if (eth_started)
return -EINVAL;

memset(&bcast_addr, 0xff, sizeof(bcast_addr));
bcast_addr.type = htonl(TIPC_MEDIA_TYPE_ETH);
memset(&bcast_addr.dev_addr, 0xff, ETH_ALEN);

memset(eth_bearers, 0, sizeof(eth_bearers));

res = tipc_register_media(TIPC_MEDIA_TYPE_ETH, "eth",
Expand Down

0 comments on commit 4938450

Please sign in to comment.