From patchwork Mon Feb 1 09:56:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 576431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 80522140B93 for ; Mon, 1 Feb 2016 21:03:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=kzAO/YUJ; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4D7AD28C036; Mon, 1 Feb 2016 10:58:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1EB1128A6AF for ; Mon, 1 Feb 2016 10:57:10 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 1 Feb 2016 10:57:04 +0100 (CET) Received: by mail-wm0-f68.google.com with SMTP id r129so8284040wmr.0 for ; Mon, 01 Feb 2016 01:57:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nQrSYgaFj+TnGS8yPDGO4OTfRFTkg6x44jK6kxEc5Vg=; b=kzAO/YUJc3+vtQt/wjcKzmJYhGAgQfEdJnnAlL+AQO3OUjOX+uRufcUyRJxY3tZAmk ydF7lTEELiIJ7978yXHl4kJNpY9qAIacuBfkLtu4Jo+0WFwTguY6yTKu7Bsp0JTjp836 q7gYQd4UY7T8ZDbFHUvNzbC1VBhE62JeVeOU9SOQ+FPNV44bDTtPcccdgMKrVcdORcsw 0zroSpUFB2TR/b/eOM2TMqIfc8lhAFif7JkaiwCsgAOq37DCYx1jVexEY3CC5Oq7RPKa UXIOCZbJLmx3ntYpeDKLDOPYScJ6kJ0UqRtd7xYSom9OnMw5E9Rrb5t61JyOOfdZUNXo KZUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nQrSYgaFj+TnGS8yPDGO4OTfRFTkg6x44jK6kxEc5Vg=; b=IVjch+gkxarlg8OrtSUCCAedTpNjYGKzXEkySOoGGo8I2rRi8inSTvtnHY5wHVzbeb o8eJ/lqLu+GhHbPxBMb4rZa68kxdYASukoo47sG8myp7fyb5Ai2PlOzOh0RjcNWwQNg9 Y41XI4u24KiCXw+GfBHxIyq7I6nITBBaTKSymrOUKMSX+j/rntZT3+fG9z2aDJJcpDTE aWymZezo3B3MGKcDK5yyuvgsAGP8hRARy46wi6QKBmi2KMTYC/TaPEDW+4jfHIaCLAFP 3vkySMTzZxuRJPv+XyaOm2z4VaSlF7k2EAgPCLweVq+H5peQ3fZvBZAshUDMDVO5k+Ut 7TJw== X-Gm-Message-State: AG10YOQJBe6adc6i82iKYg0ZJula2ycxDG5EFlvrfpY0hol88M94DsUPkB27ESPOkosa/A== X-Received: by 10.28.6.213 with SMTP id 204mr10408165wmg.47.1454320624318; Mon, 01 Feb 2016 01:57:04 -0800 (PST) Received: from cplx43.eu.thmulti.com ([141.11.62.7]) by smtp.gmail.com with ESMTPSA id m67sm8118759wma.10.2016.02.01.01.57.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Feb 2016 01:57:03 -0800 (PST) From: Hans Dedecker To: openwrt-devel@lists.openwrt.org Date: Mon, 1 Feb 2016 10:56:21 +0100 Message-Id: <1454320590-20710-7-git-send-email-dedeckeh@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1454320590-20710-1-git-send-email-dedeckeh@gmail.com> References: <1454320590-20710-1-git-send-email-dedeckeh@gmail.com> Cc: Hans Dedecker , cyrus@openwrt.org Subject: [OpenWrt-Devel] [PATCH netifd 07/16] proto-shell: Fix possible segfault X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Hans Dedecker --- proto-shell.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proto-shell.c b/proto-shell.c index 8a3ff69..25dec00 100644 --- a/proto-shell.c +++ b/proto-shell.c @@ -708,6 +708,8 @@ proto_shell_add_host_dependency(struct proto_shell_state *state, struct blob_att return UBUS_STATUS_PERMISSION_DENIED; dep = calloc(1, sizeof(*dep) + strlen(ifname) + 1); + if (!dep) + return UBUS_STATUS_UNKNOWN_ERROR; if (!host[0] && ifname[0]) { dep->any = true; @@ -834,6 +836,9 @@ proto_shell_attach(const struct proto_handler *h, struct interface *iface, struct proto_shell_state *state; state = calloc(1, sizeof(*state)); + if (!state) + return NULL; + INIT_LIST_HEAD(&state->deps); state->config = malloc(blob_pad_len(attr));