From patchwork Thu Nov 23 14:04:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17158 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 534C180873; Thu, 23 Nov 2017 15:06:04 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=openmesh-com.20150623.gappssmtp.com header.i=@openmesh-com.20150623.gappssmtp.com header.b="zUZBD2oq"; dkim-atps=neutral Received-SPF: None (mailfrom) identity=mailfrom; client-ip=2607:f8b0:400d:c09::241; helo=mail-qk0-x241.google.com; envelope-from=sven.eckelmann@openmesh.com; receiver= Received: from mail-qk0-x241.google.com (mail-qk0-x241.google.com [IPv6:2607:f8b0:400d:c09::241]) by open-mesh.org (Postfix) with ESMTPS id E517D806A5 for ; Thu, 23 Nov 2017 15:05:29 +0100 (CET) Received: by mail-qk0-x241.google.com with SMTP id c123so10703179qkf.7 for ; Thu, 23 Nov 2017 06:05:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openmesh-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+rXBBfY5XaqOl9+xkE2OMgybYanEq/VAp9MLFR1F/5A=; b=zUZBD2oqJLZuBy3clAZWZelddzTBaS+ySfZhocheoqU9qk6HnVfLFWosq2J8YEIRkq 26FLwL86ziB8F9JWYlU1LrwaRN54e4IoUmNruuyUpM7JQqfaodKKO2SXA2AfINZos3sl dAW/itMGe60mgcMr4uYZ24/d6xNo/IG0bdw8mqIqdQMjGzfzNOVVuzIFp0QCKF4z39oo rxFJVNm9Gx4jWI3eHcA7Ub50avGqLj0KzAJlZjiO762YhjCiqv7kEywnQ3PC8ZsXKnqA 6GXtWUBJQv/jkDpWnM0BRkDjMCKws41nK4A4fa9JpSck/b3h3IZQekY0vtXXrM+m3uRu TSrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+rXBBfY5XaqOl9+xkE2OMgybYanEq/VAp9MLFR1F/5A=; b=IJ9us2+UKDfhuOaPQJwGtyjKoONZA00dCEOq0MSUMCPZDRmL852NHKt4gS7D32MrZ0 1psYEFaUO90Xzx5HEiCWZ6DkBTpllQanq+RE/iVEQzTofvgF92XAHsY8sE7aFCgVtSgJ uAFQ1ZbgJfaJfDtin/jtw4eGvLLRo1h3USb4S6ma5YEGbqYsi6dJEdxHhrgAxKCJAumk ivCeQeHWhRfQbeNnZ3F9olKHx8EKaAMoC3lvxcDZZH8mjNybQ+6KxV6s15tZMS/+1FXF 7Ebwip7RmjG5rOA6fel7hJQ/89c0fa0kxN7orCAQFgpv40jW70MCcFahlKucBIgBD/51 xVrA== X-Gm-Message-State: AJaThX4h5g5HjaJTvSunyeSxIyjhcNL6DGywycFAWN/4yhRD8XZLj+HB upGCXHC7RfflPsYqIO2mWxWmA/YB X-Google-Smtp-Source: AGs4zMZcvWA/5yQXVZmVkKTILJhV1yuhM+0UXlNW4oJjNJPBTEi7JdtNsVjeae1k8sEFHslwb+9X8g== X-Received: by 10.55.39.84 with SMTP id n81mr18421822qkn.278.1511445926892; Thu, 23 Nov 2017 06:05:26 -0800 (PST) Received: from sven-desktop.home.narfation.org (p2003007C6F53F7FA6FAE965552C91071.dip0.t-ipconnect.de. [2003:7c:6f53:f7fa:6fae:9655:52c9:1071]) by smtp.gmail.com with ESMTPSA id 2sm13325314qto.28.2017.11.23.06.05.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Nov 2017 06:05:26 -0800 (PST) From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 23 Nov 2017 15:04:41 +0100 Message-Id: <20171123140444.17119-8-sven.eckelmann@openmesh.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171123140444.17119-1-sven.eckelmann@openmesh.com> References: <20171123140444.17119-1-sven.eckelmann@openmesh.com> Subject: [B.A.T.M.A.N.] [PATCH 07/10] batctl: Free nl_sock on genl_ctrl_resolve error X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Cc: Sven Eckelmann Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" genl_ctrl_resolve may return NULL on errors. The code must then free the socket which was used to start the genl_ctrl_resolve and stop the function with an error code. Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs") Signed-off-by: Sven Eckelmann --- netlink.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/netlink.c b/netlink.c index b95063a..de81d08 100644 --- a/netlink.c +++ b/netlink.c @@ -301,8 +301,10 @@ static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) genl_connect(sock); family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) + if (family < 0) { + nl_socket_free(sock); return NULL; + } msg = nlmsg_alloc(); if (!msg) { @@ -410,8 +412,10 @@ int netlink_print_routing_algos(void) genl_connect(sock); family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) - return -EOPNOTSUPP; + if (family < 0) { + last_err = -EOPNOTSUPP; + goto err_free_sock; + } msg = nlmsg_alloc(); if (!msg) { @@ -1125,8 +1129,10 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, genl_connect(sock); family = genl_ctrl_resolve(sock, BATADV_NL_NAME); - if (family < 0) - return -EOPNOTSUPP; + if (family < 0) { + last_err = -EOPNOTSUPP; + goto err_free_sock; + } ifindex = if_nametoindex(mesh_iface); if (!ifindex) {