From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8469BC3276E for ; Thu, 2 Jan 2020 22:44:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 49D5E20863 for ; Thu, 2 Jan 2020 22:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578005045; bh=lZnjv60PyzNBbdHUduFUobSQtOVpevO4SmCxef2y/fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fdhRmsgKNHaSc1F9VEJQHmMIK4w3DqYD7uPfzaLSkz8RJLtksJvIXx7j8Lgzj11PV TgiY15BUNzHLwmHOk6TbzrWrtBi28QXpncDq1HyAnc1GKYRJTYAkar6xTnGRHDTIEz dru3A+8fhwV/DH9nHGolbLmLpvsBF2u8ndNeYmRA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730632AbgABWdu (ORCPT ); Thu, 2 Jan 2020 17:33:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:41476 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729853AbgABWdo (ORCPT ); Thu, 2 Jan 2020 17:33:44 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 63C4A20863; Thu, 2 Jan 2020 22:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578004423; bh=lZnjv60PyzNBbdHUduFUobSQtOVpevO4SmCxef2y/fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2ipcnKHplQ7GVE+peYkyoP8mkJEBDDTn34mtnh29dnarEb9ClyaKsTByeXxUT3jmQ EuXHvx27HQ0zuWLodpH9ytpTGNzX9rgfcwY2u/oXL8uRxbH40EQkI3g5snuI80NILn u06lb687HjPlrLD5Tm2QByKr9yoH+JU8yt51sM8s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mattias Jacobsson <2pi@mok.nu>, Jiri Olsa , Peter Zijlstra , Sanskriti Sharma , Arnaldo Carvalho de Melo , Nobuhiro Iwamatsu Subject: [PATCH 4.9 155/171] perf strbuf: Remove redundant va_end() in strbuf_addv() Date: Thu, 2 Jan 2020 23:08:06 +0100 Message-Id: <20200102220608.303265673@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200102220546.960200039@linuxfoundation.org> References: <20200102220546.960200039@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mattias Jacobsson <2pi@mok.nu> commit 099be748865eece21362aee416c350c0b1ae34df upstream. Each call to va_copy() should have one, and only one, corresponding call to va_end(). In strbuf_addv() some code paths result in va_end() getting called multiple times. Remove the superfluous va_end(). Signed-off-by: Mattias Jacobsson <2pi@mok.nu> Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Sanskriti Sharma Link: http://lkml.kernel.org/r/20181229141750.16945-1-2pi@mok.nu Fixes: ce49d8436cff ("perf strbuf: Match va_{add,copy} with va_end") Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/strbuf.c | 1 - 1 file changed, 1 deletion(-) --- a/tools/perf/util/strbuf.c +++ b/tools/perf/util/strbuf.c @@ -116,7 +116,6 @@ static int strbuf_addv(struct strbuf *sb return ret; } len = vsnprintf(sb->buf + sb->len, sb->alloc - sb->len, fmt, ap_saved); - va_end(ap_saved); if (len > strbuf_avail(sb)) { pr_debug("this should not happen, your vsnprintf is broken"); va_end(ap_saved);