summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Rutherford <john.rutherford@dektech.com.au>2019-11-26 13:52:55 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-05 09:21:31 +0100
commit2e849d71df3a589a5676dffc2f835f250c774b79 (patch)
tree753bda93ca9d64515d859f3e41d068d74bee3beb
parent93c259c582afb5890f3d6d054160ba0aa5f78a2a (diff)
downloadlinux-stable-2e849d71df3a589a5676dffc2f835f250c774b79.tar.gz
linux-stable-2e849d71df3a589a5676dffc2f835f250c774b79.tar.bz2
linux-stable-2e849d71df3a589a5676dffc2f835f250c774b79.zip
tipc: fix link name length check
[ Upstream commit fd567ac20cb0377ff466d3337e6e9ac5d0cb15e4 ] In commit 4f07b80c9733 ("tipc: check msg->req data len in tipc_nl_compat_bearer_disable") the same patch code was copied into routines: tipc_nl_compat_bearer_disable(), tipc_nl_compat_link_stat_dump() and tipc_nl_compat_link_reset_stats(). The two link routine occurrences should have been modified to check the maximum link name length and not bearer name length. Fixes: 4f07b80c9733 ("tipc: check msg->reg data len in tipc_nl_compat_bearer_disable") Signed-off-by: John Rutherford <john.rutherford@dektech.com.au> Acked-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/tipc/netlink_compat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index b4860084a8f5..29e684054abe 100644
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -548,7 +548,7 @@ static int tipc_nl_compat_link_stat_dump(struct tipc_nl_compat_msg *msg,
if (len <= 0)
return -EINVAL;
- len = min_t(int, len, TIPC_MAX_BEARER_NAME);
+ len = min_t(int, len, TIPC_MAX_LINK_NAME);
if (!string_is_valid(name, len))
return -EINVAL;
@@ -830,7 +830,7 @@ static int tipc_nl_compat_link_reset_stats(struct tipc_nl_compat_cmd_doit *cmd,
if (len <= 0)
return -EINVAL;
- len = min_t(int, len, TIPC_MAX_BEARER_NAME);
+ len = min_t(int, len, TIPC_MAX_LINK_NAME);
if (!string_is_valid(name, len))
return -EINVAL;