summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorSultan Alsawaf <sultanxda@gmail.com>2018-06-06 15:56:54 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-08 13:03:35 +0100
commitbb1d0ac3ef02d0e3e893b75933e556e86c915cfe (patch)
tree36018430d94dc9daa935597f52322c47ec401fe7 /net/ipv4
parente26457da0cdb5498724fd46279057d49c95cbba6 (diff)
downloadlinux-exynos-bb1d0ac3ef02d0e3e893b75933e556e86c915cfe.tar.gz
linux-exynos-bb1d0ac3ef02d0e3e893b75933e556e86c915cfe.tar.bz2
linux-exynos-bb1d0ac3ef02d0e3e893b75933e556e86c915cfe.zip
ip_tunnel: Fix name string concatenate in __ip_tunnel_create()
commit 000ade8016400d93b4d7c89970d96b8c14773d45 upstream. By passing a limit of 2 bytes to strncat, strncat is limited to writing fewer bytes than what it's supposed to append to the name here. Since the bounds are checked on the line above this, just remove the string bounds checks entirely since they're unneeded. Signed-off-by: Sultan Alsawaf <sultanxda@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_tunnel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 72eee34092ae..fabc299cb875 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -261,8 +261,8 @@ static struct net_device *__ip_tunnel_create(struct net *net,
} else {
if (strlen(ops->kind) > (IFNAMSIZ - 3))
goto failed;
- strlcpy(name, ops->kind, IFNAMSIZ);
- strncat(name, "%d", 2);
+ strcpy(name, ops->kind);
+ strcat(name, "%d");
}
ASSERT_RTNL();