diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-31 22:19:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-31 22:19:59 -0400 |
| commit | 6851cf28db1c4becc25a2906ecd080c0022a9f11 (patch) | |
| tree | c1905f23eaf0b2aeb7195a78ca378bcb94414251 /net/tipc/link.c | |
| parent | 24197ee2102359b59044234347dd3504302fa97d (diff) | |
| parent | 7494cfa6d36d1556f17baa012dd93833620783db (diff) | |
| download | linux-6851cf28db1c4becc25a2906ecd080c0022a9f11.tar.gz linux-6851cf28db1c4becc25a2906ecd080c0022a9f11.tar.xz | |
Merge branch 'tipc-slim-down-name-table'
Jon Maloy says:
====================
tipc: slim down name table
We clean up and improve the name binding table:
- Replace the memory consuming 'sub_sequence/service range' array with
an RB tree.
- Introduce support for overlapping service sequences/ranges
v2: #1: Fixed a missing initialization reported by David Miller
#4: Obsoleted and replaced a few more macros to get a consistent
terminology in the API.
#5: Added new commit to fix a potential string overflow bug (it
is still only in net-next) reported by Arnd Bergmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 1289b4ba404f..695acb783969 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -462,7 +462,8 @@ bool tipc_link_create(struct net *net, char *if_name, int bearer_id, sprintf(peer_str, "%x", peer); } /* Peer i/f name will be completed by reset/activate message */ - sprintf(l->name, "%s:%s-%s:unknown", self_str, if_name, peer_str); + snprintf(l->name, sizeof(l->name), "%s:%s-%s:unknown", + self_str, if_name, peer_str); strcpy(l->if_name, if_name); l->addr = peer; @@ -1810,7 +1811,7 @@ int tipc_link_bc_nack_rcv(struct tipc_link *l, struct sk_buff *skb, void tipc_link_set_queue_limits(struct tipc_link *l, u32 win) { - int max_bulk = TIPC_MAX_PUBLICATIONS / (l->mtu / ITEM_SIZE); + int max_bulk = TIPC_MAX_PUBL / (l->mtu / ITEM_SIZE); l->window = win; l->backlog[TIPC_LOW_IMPORTANCE].limit = max_t(u16, 50, win); |