From patchwork Fri Jul 24 16:11:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Shengju X-Patchwork-Id: 499798 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 614911409BB for ; Sat, 25 Jul 2015 02:11:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754100AbbGXQLy (ORCPT ); Fri, 24 Jul 2015 12:11:54 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:3355 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753361AbbGXQLx (ORCPT ); Fri, 24 Jul 2015 12:11:53 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.15]) by rmmx-syy-dmz-app06-12006 (RichMail) with SMTP id 2ee655b263c0681-4533f; Sat, 25 Jul 2015 00:11:45 +0800 (CST) X-RM-TRANSID: 2ee655b263c0681-4533f X-RM-SPAM-FLAG: 00000000 Received: from promote.cache-dns.local.localdomain (unknown[223.64.62.121]) by rmsmtp-syy-appsvr08-12008 (RichMail) with SMTP id 2ee855b263be710-56417; Sat, 25 Jul 2015 00:11:45 +0800 (CST) X-RM-TRANSID: 2ee855b263be710-56417 From: Zhang Shengju To: netdev@vger.kernel.org Cc: Zhang Shengju Subject: [PATCH] ip/ip6tunnel: fix missing return value check Date: Fri, 24 Jul 2015 12:11:32 -0400 Message-Id: <1437754292-8279-1-git-send-email-zhangshengju@cmss.chinamobile.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 33c78e3..d69fe84 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,