From patchwork Mon Feb 10 23:06:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Zanussi X-Patchwork-Id: 213226 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 E5D2EC352A4 for ; Mon, 10 Feb 2020 23:07:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B5A1B20873 for ; Mon, 10 Feb 2020 23:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581376031; bh=UHgRzz6I37tz2Q+lWdRFPPj4iTd0HtTTsHKNvR/OA1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:List-ID:From; b=mI1z+CHvB+a7fQWAy5DaJe+28Tj3rWX5jQJz+K1IdFAMlB4Oxbo/JNd5wUShIgrOf hkMExMFQyXEoQ8eQbg1xKFmMHHuTpW5KK73VpswwsY/howSe35zj74bHlpMlqUOBdr ImW1PMyo+caSN2nS/kASC/afbPHSoYDnUtSB2kZg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727575AbgBJXG6 (ORCPT ); Mon, 10 Feb 2020 18:06:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:46624 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727116AbgBJXG6 (ORCPT ); Mon, 10 Feb 2020 18:06:58 -0500 Received: from localhost.localdomain (c-98-220-238-81.hsd1.il.comcast.net [98.220.238.81]) (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 88B252082F; Mon, 10 Feb 2020 23:06:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581376018; bh=UHgRzz6I37tz2Q+lWdRFPPj4iTd0HtTTsHKNvR/OA1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References:From; b=NbDwu5DJ+OhLbEsB0iEXzPiS2f1BRfRpaA9SiG1xLZE+uHdS8fT6GTyGZdJJNzY/x RXgAFTENUMsCd3Z+U95/BMslkXn5ZYvBCxtHvpeDTIlSHdqTf788adBeqhLED/RW4i tWj1jLyM5vyTNEVtp5wBfzZFvBSWnWLpM+UxHaDw= From: Tom Zanussi To: rostedt@goodmis.org Cc: artem.bityutskiy@linux.intel.com, mhiramat@kernel.org, linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org Subject: [PATCH 1/3] tracing: Add missing nest end to synth_event_trace_start() error case Date: Mon, 10 Feb 2020 17:06:48 -0600 Message-Id: <20abc444b3eeff76425f895815380abe7aa53ff8.1581374549.git.zanussi@kernel.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-rt-users-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rt-users@vger.kernel.org If the ring_buffer reserve in synth_event_trace_start() fails, the matching ring_buffer_nest_end() should be called in the error code, since nothing else will ever call it in this case. Signed-off-by: Tom Zanussi --- kernel/trace/trace_events_hist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index b3bcfd8c7332..a546ffa14785 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -2043,6 +2043,7 @@ int synth_event_trace_start(struct trace_event_file *file, entry = trace_event_buffer_reserve(&trace_state->fbuffer, file, sizeof(*entry) + fields_size); if (!entry) { + ring_buffer_nest_end(trace_state->buffer); ret = -EINVAL; goto out; }