From patchwork Wed Jun 10 13:08:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Klauser X-Patchwork-Id: 1306917 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=distanz.ch Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49hnNQ5zl8z9sQx for ; Wed, 10 Jun 2020 23:08:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729128AbgFJNIG (ORCPT ); Wed, 10 Jun 2020 09:08:06 -0400 Received: from sym2.noone.org ([178.63.92.236]:40362 "EHLO sym2.noone.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728844AbgFJNIF (ORCPT ); Wed, 10 Jun 2020 09:08:05 -0400 Received: by sym2.noone.org (Postfix, from userid 1002) id 49hnNN1RwKzvjc1; Wed, 10 Jun 2020 15:08:04 +0200 (CEST) From: Tobias Klauser To: Alexei Starovoitov , Daniel Borkmann Cc: bpf@vger.kernel.org Subject: [PATCH bpf] tools, bpftool: Fix memory leak in codegen error cases Date: Wed, 10 Jun 2020 15:08:04 +0200 Message-Id: <20200610130804.21423-1-tklauser@distanz.ch> X-Mailer: git-send-email 2.11.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Free the memory allocated for the template on error paths in function codegen. Signed-off-by: Tobias Klauser Acked-by: Andrii Nakryiko --- 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 a3c4bb86c05a..ecbae47e66b8 100644 --- a/tools/bpf/bpftool/gen.c +++ b/tools/bpf/bpftool/gen.c @@ -224,6 +224,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; } } @@ -234,6 +235,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; } }