diff options
| author | Xin Long <lucien.xin@gmail.com> | 2023-05-14 21:52:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-05-15 11:21:20 +0200 |
| commit | 35a089b5d793d2bfd2cc7cfa6104545184de2ce7 (patch) | |
| tree | ab4a17e1ba482527d1a03d895bfb776f7e73f8b8 /net/tipc | |
| parent | tipc: do not update mtu if msg_max is too small in mtu negotiation (diff) | |
| download | linux-35a089b5d793d2bfd2cc7cfa6104545184de2ce7.tar.xz linux-35a089b5d793d2bfd2cc7cfa6104545184de2ce7.zip | |
tipc: check the bearer min mtu properly when setting it by netlink
Checking the bearer min mtu with tipc_udp_mtu_bad() only works for
IPv4 UDP bearer, and IPv6 UDP bearer has a different value for the
min mtu. This patch checks with encap_hlen + TIPC_MIN_BEARER_MTU
for min mtu, which works for both IPv4 and IPv6 UDP bearer.
Note that tipc_udp_mtu_bad() is still used to check media min mtu
in __tipc_nl_media_set(), as m->mtu currently is only used by the
IPv4 UDP bearer as its default mtu value.
Fixes: 682cd3cf946b ("tipc: confgiure and apply UDP bearer MTU on running links")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Jon Maloy <jmaloy@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/bearer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 0e9a29e1536b..53881406e200 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -1151,8 +1151,8 @@ int __tipc_nl_bearer_set(struct sk_buff *skb, struct genl_info *info) return -EINVAL; } #ifdef CONFIG_TIPC_MEDIA_UDP - if (tipc_udp_mtu_bad(nla_get_u32 - (props[TIPC_NLA_PROP_MTU]))) { + if (nla_get_u32(props[TIPC_NLA_PROP_MTU]) < + b->encap_hlen + TIPC_MIN_BEARER_MTU) { NL_SET_ERR_MSG(info->extack, "MTU value is out-of-range"); return -EINVAL; |