From patchwork Thu Nov 23 14:04:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17155 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 1ABE4806B6; Thu, 23 Nov 2017 15:05:34 +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="crlUggAG"; 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 8A4068066D for ; Thu, 23 Nov 2017 15:05:20 +0100 (CET) Received: by mail-qk0-x241.google.com with SMTP id w125so21101227qkb.6 for ; Thu, 23 Nov 2017 06:05:20 -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=UwtIz3GVOI5/qazVEzjRp6q3PKDJjZmfZFmfxzCkIOo=; b=crlUggAGUdcBbE7yn+GfwgYUGU/45j1iVW41oj2CjnIsE0DhynR/cRzc+JrwFD9li8 hZVcjqxNe3ys/qB6F7Uz3SB1EDzGKB4Ekb16ebs4lPKu6vUaaTAJDS6NprGf37ZKgPeD nywuS+MqDmaSZ05caVniJe2LJcrcTnGU0rePWN6DPlnNZUBfPumj2k8Zse16IZUgSxvm UMnm01Bk4FLuMhVPfkf2kWrUm8Vniys9ZnOVQJLK9qogV2i++Zc5lAKtpXEhVvcg04DJ ltiFLa+dAk4OBcaB1VDcts3NoQuZcGOTwhc5NB02VtFRMfWOwCF4dHWAKN2pa24nvkuz WthQ== 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=UwtIz3GVOI5/qazVEzjRp6q3PKDJjZmfZFmfxzCkIOo=; b=EfxQD8XX0qWvO/yxo36w/6V66S7lvzmEXS4A4wyBO/fM4YLqx3Nj1rVildd94UEOmu xdzwOMsRfRtARhxgXJIljGK5KOiViyeVLbteLQQidgaCjEY9DgVTWZtG/JVK9t5rdvHe RaMirCj4ocBe/LYHqRQcOJXibeeN3ucDxCYLby88YTQnIETzyu9uphR3HxNeDiu3Xrva xWJy0zoD/PzNVWtnDHssR+rFG5YaZdzanwCZXnTj1domRTZYWy7t+o1qtVb5wK+PHPoo /jNtS0mZP4vupMP0NAS63pRlGgX4Yf2QoqnKGTj5LauTpQZXAumy0g968Ud4ejWxtg4y bpcw== X-Gm-Message-State: AJaThX5EO4zpKlqBti86z4S14SbX2LB8zPmJDAqC9OppuGgeXYDeXVkp /YUVGQAqfO5Oa6CeSUsp6MIC6QmO X-Google-Smtp-Source: AGs4zMbznacUtT9AO5zIuUvh7hL5Q/M/zytvitMJA/INjvbH3+A48TB51gC6CdZAFy0j7tWXZuQnDQ== X-Received: by 10.55.145.197 with SMTP id t188mr23684851qkd.267.1511445915587; Thu, 23 Nov 2017 06:05:15 -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 y66sm6895232qkd.46.2017.11.23.06.05.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Nov 2017 06:05:15 -0800 (PST) From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 23 Nov 2017 15:04:38 +0100 Message-Id: <20171123140444.17119-5-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 04/10] batctl: Handle nlmsg_alloc errors 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" nlmsg_alloc may return NULL on errors. The processing has to be aborted when this happens. Fixes: d8dd1ff1a0fe ("batctl: Use netlink to replace some of debugfs") Signed-off-by: Sven Eckelmann --- netlink.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/netlink.c b/netlink.c index 7fb1ee1..e3d7892 100644 --- a/netlink.c +++ b/netlink.c @@ -302,6 +302,11 @@ static char *netlink_get_info(int ifindex, uint8_t nl_cmd, const char *header) return NULL; msg = nlmsg_alloc(); + if (!msg) { + nl_socket_free(sock); + return NULL; + } + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, 0, BATADV_CMD_GET_MESH_INFO, 1); @@ -399,6 +404,11 @@ int netlink_print_routing_algos(void) return -EOPNOTSUPP; msg = nlmsg_alloc(); + if (!msg) { + last_err = -ENOMEM; + goto err_free_sock; + } + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, NLM_F_DUMP, BATADV_CMD_GET_ROUTING_ALGOS, 1); @@ -415,6 +425,8 @@ int netlink_print_routing_algos(void) nl_cb_err(cb, NL_CB_CUSTOM, print_error, NULL); nl_recvmsgs(sock, cb); + +err_free_sock: nl_socket_free(sock); if (!last_err) @@ -1131,6 +1143,9 @@ static int netlink_print_common(char *mesh_iface, char *orig_iface, header); msg = nlmsg_alloc(); + if (!msg) + continue; + genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, family, 0, NLM_F_DUMP, nl_cmd, 1);