From cb89c7c70a6e4577d57fcc073e129922524f7695 Mon Sep 17 00:00:00 2001 From: Zhang Shengju Date: Fri, 24 Jul 2015 12:11:32 -0400 Subject: [PATCH] ip/ip6tunnel: fix missing return value check Make sure that return value of each socket() call is properly checked and do not continue processing if the call failed. Signed-off-by: Zhang Shengju --- ip/tunnel.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ip/tunnel.c b/ip/tunnel.c index 33c78e3f..d69fe84d 100644 --- a/ip/tunnel.c +++ b/ip/tunnel.c @@ -73,7 +73,13 @@ int tnl_get_ioctl(const char *basedev, void *p) strncpy(ifr.ifr_name, basedev, IFNAMSIZ); ifr.ifr_ifru.ifru_data = (void*)p; + fd = socket(preferred_family, SOCK_DGRAM, 0); + if (fd < 0) { + fprintf(stderr, "create socket failed: %s\n", strerror(errno)); + return -1; + } + err = ioctl(fd, SIOCGETTUNNEL, &ifr); if (err) fprintf(stderr, "get tunnel \"%s\" failed: %s\n", basedev, @@ -94,7 +100,13 @@ int tnl_add_ioctl(int cmd, const char *basedev, const char *name, void *p) else strncpy(ifr.ifr_name, basedev, IFNAMSIZ); ifr.ifr_ifru.ifru_data = p; + fd = socket(preferred_family, SOCK_DGRAM, 0); + if (fd < 0) { + fprintf(stderr, "create socket failed: %s\n", strerror(errno)); + return -1; + } + err = ioctl(fd, cmd, &ifr); if (err) fprintf(stderr, "add tunnel \"%s\" failed: %s\n", ifr.ifr_name, @@ -115,7 +127,13 @@ int tnl_del_ioctl(const char *basedev, const char *name, void *p) strncpy(ifr.ifr_name, basedev, IFNAMSIZ); ifr.ifr_ifru.ifru_data = p; + fd = socket(preferred_family, SOCK_DGRAM, 0); + if (fd < 0) { + fprintf(stderr, "create socket failed: %s\n", strerror(errno)); + return -1; + } + err = ioctl(fd, SIOCDELTUNNEL, &ifr); if (err) fprintf(stderr, "delete tunnel \"%s\" failed: %s\n", @@ -133,7 +151,13 @@ static int tnl_gen_ioctl(int cmd, const char *name, strncpy(ifr.ifr_name, name, IFNAMSIZ); ifr.ifr_ifru.ifru_data = p; + fd = socket(preferred_family, SOCK_DGRAM, 0); + if (fd < 0) { + fprintf(stderr, "create socket failed: %s\n", strerror(errno)); + return -1; + } + err = ioctl(fd, cmd, &ifr); if (err && errno != skiperr) fprintf(stderr, "%s: ioctl %x failed: %s\n", name,