Skip to content

L
linux
Commit 3e6c8cd5 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files
Options

[TIPC]: endianness annotations 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d54a81d3
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 52 deletions
include/linux/tipc_config.h
View file @ 3e6c8cd5
...@@ -194,34 +194,34 @@ ...@@ -194,34 +194,34 @@
struct tipc_node_info { struct tipc_node_info {
__u32 addr; /* network address of node */ __be32 addr; /* network address of node */
__u32 up; /* 0=down, 1= up */ __be32 up; /* 0=down, 1= up */
}; };
struct tipc_link_info { struct tipc_link_info {
__u32 dest; /* network address of peer node */ __be32 dest; /* network address of peer node */
__u32 up; /* 0=down, 1=up */ __be32 up; /* 0=down, 1=up */
char str[TIPC_MAX_LINK_NAME]; /* link name */ char str[TIPC_MAX_LINK_NAME]; /* link name */
}; };
struct tipc_bearer_config { struct tipc_bearer_config {
__u32 priority; /* Range [1,31]. Override per link */ __be32 priority; /* Range [1,31]. Override per link */
__u32 detect_scope; __be32 detect_scope;
char name[TIPC_MAX_BEARER_NAME]; char name[TIPC_MAX_BEARER_NAME];
}; };
struct tipc_link_config { struct tipc_link_config {
__u32 value; __be32 value;
char name[TIPC_MAX_LINK_NAME]; char name[TIPC_MAX_LINK_NAME];
}; };
#define TIPC_NTQ_ALLTYPES 0x80000000 #define TIPC_NTQ_ALLTYPES 0x80000000
struct tipc_name_table_query { struct tipc_name_table_query {
__u32 depth; /* 1:type, 2:+name info, 3:+port info, 4+:+debug info */ __be32 depth; /* 1:type, 2:+name info, 3:+port info, 4+:+debug info */
__u32 type; /* {t,l,u} info ignored if high bit of "depth" is set */ __be32 type; /* {t,l,u} info ignored if high bit of "depth" is set */
__u32 lowbound; /* (i.e. displays all entries of name table) */ __be32 lowbound; /* (i.e. displays all entries of name table) */
__u32 upbound; __be32 upbound;
}; };
/* /*
...@@ -262,8 +262,8 @@ struct tipc_route_info { ...@@ -262,8 +262,8 @@ struct tipc_route_info {
*/ */
struct tlv_desc { struct tlv_desc {
__u16 tlv_len; /* TLV length (descriptor + value) */ __be16 tlv_len; /* TLV length (descriptor + value) */
__u16 tlv_type; /* TLV identifier */ __be16 tlv_type; /* TLV identifier */
}; };
#define TLV_ALIGNTO 4 #define TLV_ALIGNTO 4
...@@ -377,9 +377,9 @@ struct tipc_genlmsghdr { ...@@ -377,9 +377,9 @@ struct tipc_genlmsghdr {
struct tipc_cfg_msg_hdr struct tipc_cfg_msg_hdr
{ {
__u32 tcm_len; /* Message length (including header) */ __be32 tcm_len; /* Message length (including header) */
__u16 tcm_type; /* Command type */ __be16 tcm_type; /* Command type */
__u16 tcm_flags; /* Additional flags */ __be16 tcm_flags; /* Additional flags */
char tcm_reserved[8]; /* Unused */ char tcm_reserved[8]; /* Unused */
}; };
......
include/net/tipc/tipc_bearer.h
View file @ 3e6c8cd5
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
*/ */
struct tipc_media_addr { struct tipc_media_addr {
__u32 type; /* bearer type (network byte order) */ __be32 type; /* bearer type (network byte order) */
union { union {
__u8 eth_addr[6]; /* 48 bit Ethernet addr (byte array) */ __u8 eth_addr[6]; /* 48 bit Ethernet addr (byte array) */
#if 0 #if 0
......
include/net/tipc/tipc_msg.h
View file @ 3e6c8cd5
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
struct tipc_msg { struct tipc_msg {
u32 hdr[15]; __be32 hdr[15];
}; };
......
net/tipc/config.c
View file @ 3e6c8cd5
...@@ -107,7 +107,7 @@ int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type, ...@@ -107,7 +107,7 @@ int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type,
struct sk_buff *tipc_cfg_reply_unsigned_type(u16 tlv_type, u32 value) struct sk_buff *tipc_cfg_reply_unsigned_type(u16 tlv_type, u32 value)
{ {
struct sk_buff *buf; struct sk_buff *buf;
u32 value_net; __be32 value_net;
buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(value))); buf = tipc_cfg_reply_alloc(TLV_SPACE(sizeof(value)));
if (buf) { if (buf) {
...@@ -284,8 +284,7 @@ static struct sk_buff *cfg_set_own_addr(void) ...@@ -284,8 +284,7 @@ static struct sk_buff *cfg_set_own_addr(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
addr = *(u32 *)TLV_DATA(req_tlv_area); addr = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
addr = ntohl(addr);
if (addr == tipc_own_addr) if (addr == tipc_own_addr)
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
if (!tipc_addr_node_valid(addr)) if (!tipc_addr_node_valid(addr))
...@@ -319,8 +318,7 @@ static struct sk_buff *cfg_set_remote_mng(void) ...@@ -319,8 +318,7 @@ static struct sk_buff *cfg_set_remote_mng(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
tipc_remote_management = (value != 0); tipc_remote_management = (value != 0);
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
} }
...@@ -332,8 +330,7 @@ static struct sk_buff *cfg_set_max_publications(void) ...@@ -332,8 +330,7 @@ static struct sk_buff *cfg_set_max_publications(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value != delimit(value, 1, 65535)) if (value != delimit(value, 1, 65535))
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (max publications must be 1-65535)"); " (max publications must be 1-65535)");
...@@ -348,8 +345,7 @@ static struct sk_buff *cfg_set_max_subscriptions(void) ...@@ -348,8 +345,7 @@ static struct sk_buff *cfg_set_max_subscriptions(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value != delimit(value, 1, 65535)) if (value != delimit(value, 1, 65535))
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (max subscriptions must be 1-65535"); " (max subscriptions must be 1-65535");
...@@ -363,8 +359,7 @@ static struct sk_buff *cfg_set_max_ports(void) ...@@ -363,8 +359,7 @@ static struct sk_buff *cfg_set_max_ports(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value == tipc_max_ports) if (value == tipc_max_ports)
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
if (value != delimit(value, 127, 65535)) if (value != delimit(value, 127, 65535))
...@@ -383,8 +378,7 @@ static struct sk_buff *cfg_set_max_zones(void) ...@@ -383,8 +378,7 @@ static struct sk_buff *cfg_set_max_zones(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value == tipc_max_zones) if (value == tipc_max_zones)
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
if (value != delimit(value, 1, 255)) if (value != delimit(value, 1, 255))
...@@ -403,8 +397,7 @@ static struct sk_buff *cfg_set_max_clusters(void) ...@@ -403,8 +397,7 @@ static struct sk_buff *cfg_set_max_clusters(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value != delimit(value, 1, 1)) if (value != delimit(value, 1, 1))
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (max clusters fixed at 1)"); " (max clusters fixed at 1)");
...@@ -417,8 +410,7 @@ static struct sk_buff *cfg_set_max_nodes(void) ...@@ -417,8 +410,7 @@ static struct sk_buff *cfg_set_max_nodes(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value == tipc_max_nodes) if (value == tipc_max_nodes)
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
if (value != delimit(value, 8, 2047)) if (value != delimit(value, 8, 2047))
...@@ -437,8 +429,7 @@ static struct sk_buff *cfg_set_max_slaves(void) ...@@ -437,8 +429,7 @@ static struct sk_buff *cfg_set_max_slaves(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value != 0) if (value != 0)
return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
" (max secondary nodes fixed at 0)"); " (max secondary nodes fixed at 0)");
...@@ -451,8 +442,7 @@ static struct sk_buff *cfg_set_netid(void) ...@@ -451,8 +442,7 @@ static struct sk_buff *cfg_set_netid(void)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value == tipc_net_id) if (value == tipc_net_id)
return tipc_cfg_reply_none(); return tipc_cfg_reply_none();
if (value != delimit(value, 1, 9999)) if (value != delimit(value, 1, 9999))
......
net/tipc/dbg.c
View file @ 3e6c8cd5
...@@ -393,8 +393,7 @@ struct sk_buff *tipc_log_resize(const void *req_tlv_area, int req_tlv_space) ...@@ -393,8 +393,7 @@ struct sk_buff *tipc_log_resize(const void *req_tlv_area, int req_tlv_space)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_UNSIGNED))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
value = *(u32 *)TLV_DATA(req_tlv_area); value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
value = ntohl(value);
if (value != delimit(value, 0, 32768)) if (value != delimit(value, 0, 32768))
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (log size must be 0-32768)"); " (log size must be 0-32768)");
......
net/tipc/name_distr.c
View file @ 3e6c8cd5
...@@ -66,11 +66,11 @@ ...@@ -66,11 +66,11 @@
*/ */
struct distr_item { struct distr_item {
u32 type; __be32 type;
u32 lower; __be32 lower;
u32 upper; __be32 upper;
u32 ref; __be32 ref;
u32 key; __be32 key;
}; };
/** /**
......
net/tipc/node.c
View file @ 3e6c8cd5
...@@ -597,8 +597,7 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space) ...@@ -597,8 +597,7 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
domain = *(u32 *)TLV_DATA(req_tlv_area); domain = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
domain = ntohl(domain);
if (!tipc_addr_domain_valid(domain)) if (!tipc_addr_domain_valid(domain))
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (network address)"); " (network address)");
...@@ -642,8 +641,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) ...@@ -642,8 +641,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR)) if (!TLV_CHECK(req_tlv_area, req_tlv_space, TIPC_TLV_NET_ADDR))
return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR); return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
domain = *(u32 *)TLV_DATA(req_tlv_area); domain = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
domain = ntohl(domain);
if (!tipc_addr_domain_valid(domain)) if (!tipc_addr_domain_valid(domain))
return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
" (network address)"); " (network address)");
...@@ -664,8 +662,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) ...@@ -664,8 +662,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space)
/* Add TLV for broadcast link */ /* Add TLV for broadcast link */
link_info.dest = tipc_own_addr & 0xfffff00; link_info.dest = htonl(tipc_own_addr & 0xfffff00);
link_info.dest = htonl(link_info.dest);
link_info.up = htonl(1); link_info.up = htonl(1);
sprintf(link_info.str, tipc_bclink_name); sprintf(link_info.str, tipc_bclink_name);
tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info)); tipc_cfg_append_tlv(buf, TIPC_TLV_LINK_INFO, &link_info, sizeof(link_info));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7