Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp972955ybt; Wed, 17 Jun 2020 19:33:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyD1WpXcZmZnLwcZXwv3e+5HTPzDvSC+aaM4KI+8YmxNhneEVu3NWE2hh90ZTGRnxSahEOM X-Received: by 2002:a17:906:7696:: with SMTP id o22mr1831687ejm.245.1592447582950; Wed, 17 Jun 2020 19:33:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592447582; cv=none; d=google.com; s=arc-20160816; b=dn2+RSqOE7W9G4HuQvlOyTDBHS9qbfIr1MBLoruXIAvdtKFAxUVnheYZXBYf6AmAz3 UuNMzXWoMW+D3rCdx/M6NCEMTWk9bJfoii5KelzwPQArHVhuiqY6kI3BmmbPyYtisCPS +hRVorp2zxjh9YYAMiylNGi89mMH0aPVXKq90FveEylI62Uk/eC7vPvRoTpecjpjkxsy xS6ie9E0WnIDkV0ZbUJVRttDhzMylw1xshxhV1RBSKXJKmshM85rtTop2n4xPE14nfZ3 01+PcwXrO1h4DEvcIFPXq4GDJtJ81VvCeX7EXXBmGFNJgb5d/NLKEoXQxzdDTpFQmatA qeFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ayoJdga509xDsohJURGNPkcxtN5vTzAZBY1wa0uCMkg=; b=hnd7TFbbmSKpfTapzmXDnFBvqcBmFH4dYQAZHH1cQL0wlMo5E8zzG/HQjcTzH3kVjo DxLAWijFlvAtHzxIC236gdSIUgBvZGrG6EshbqXQGZIpk4gWMjc8Akqyw2+FZj1RoC+t io8iF0aKGgNlKccGnkXsdx8BxynB9ywANMIC+z1oFqoyw6Nu0Rqr/tzfpG9+tS5Llp2e DtZvg0km/8uvjXlUo2qwMkgj9rqQaQToJdjFybcwGAQ/yIezKJ+LXIVJJdwSAmab4480 Y/B/xIli3pDBk0RERCUvq9XvWER+Hg5iuiZRn6belMDZfng/zB+RqMQlHnsrKHZMikKs AEtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yXsyeDbf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a6si1208025edj.537.2020.06.17.19.32.41; Wed, 17 Jun 2020 19:33:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yXsyeDbf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387606AbgFRC3J (ORCPT + 99 others); Wed, 17 Jun 2020 22:29:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:46816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728628AbgFRBQO (ORCPT ); Wed, 17 Jun 2020 21:16:14 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3145921D82; Thu, 18 Jun 2020 01:16:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442974; bh=daUevcPQwSz8ypE0/GRlaqeC7kN8wLzXpFUXl6xgYxE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yXsyeDbfDPP2z3lrIkMJqmAOEHXmWAnHiNrd3VMV284yxd9zDKpPjNfYyZ73j277t j4DZ+9XxzKXeEaoUdtQGCosjuuVOYeHjzqxkSbXBypQsF9fZNfgnLXOuB2LuWF2Uq5 O0A8BSJAoSmR+ZXTyz51SRRb2xn3aMWyqO5C/Rys= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tobias Klauser , Daniel Borkmann , Andrii Nakryiko , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 377/388] tools, bpftool: Fix memory leak in codegen error cases Date: Wed, 17 Jun 2020 21:07:54 -0400 Message-Id: <20200618010805.600873-377-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tobias Klauser [ Upstream commit d4060ac969563113101c79433f2ae005feca1c29 ] Free the memory allocated for the template on error paths in function codegen. Signed-off-by: Tobias Klauser Signed-off-by: Daniel Borkmann Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20200610130804.21423-1-tklauser@distanz.ch Signed-off-by: Sasha Levin --- tools/bpf/bpftool/gen.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c index f8113b3646f5..f5960b48c861 100644 --- a/tools/bpf/bpftool/gen.c +++ b/tools/bpf/bpftool/gen.c @@ -225,6 +225,7 @@ static int codegen(const char *template, ...) } else { p_err("unrecognized character at pos %td in template '%s'", src - template - 1, template); + free(s); return -EINVAL; } } @@ -235,6 +236,7 @@ static int codegen(const char *template, ...) if (*src != '\t') { p_err("not enough tabs at pos %td in template '%s'", src - template - 1, template); + free(s); return -EINVAL; } } -- 2.25.1