From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18E0B4266BE for ; Thu, 14 May 2026 15:21:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778772096; cv=none; b=Syi7BgWEaXG0JXaPfYbcNv8lNPWEjOUgbvMRVhSXhjD/Dfs4eTykVEBuiy3wCXbMRJZ1V/UI+bjYwoAUsm9puAjsIB/42PFAM2RuuJJkusdNUP5nrlmoQ0K44uM8r4pvU6hNb9/scJlG/hCFwm99kDJTBtRi1VMRsOFA5LpoXp0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778772096; c=relaxed/simple; bh=DjEBjyCMRzL53cgYQ3iYI0MjtVctDAlByOGTPZPrsEk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=KQEOHMhBxpNlY3WXyzLLHcqEQz8qYXSSR+GCzTitSZ8zMeGj56Ske3AoKLC9Me7kGpMBcWh3yNlqCyZrGGfXH3A2kx4NNAnh5Oa2E39zeKlbxkZieFuSkFTxoU2pwlzN0KsCYHBoVDtRulFTpVSZORUw8ZSreYXgm1eRgDsKrKA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=iIki68Zr; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iIki68Zr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778772094; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MUv6oVqF8gdTbH+ZaqH3yLjz7+6Xw90KPRafZ0fhMDg=; b=iIki68ZrCsi/pVagwRtSL1gDSr2Z90u5nI5gXOmQVBiEoRxNyv9rK1OEL2KoT4tZ6AX1Rr okDtkw7HPX45rn7bzdo8OrKnI8EvugReElo73WRc3ptwdryfO03Hso9AmHu1bjuua5nf4O 6bSabiTeTbWaq5JGl8SeQGmquo2cbKk= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-tBLpXCzsPIuA5qkzeROTaA-1; Thu, 14 May 2026 11:21:31 -0400 X-MC-Unique: tBLpXCzsPIuA5qkzeROTaA-1 X-Mimecast-MFC-AGG-ID: tBLpXCzsPIuA5qkzeROTaA_1778772090 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DE7B01800359; Thu, 14 May 2026 15:21:29 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.csb (unknown [10.44.48.32]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CB7E430001A2; Thu, 14 May 2026 15:21:26 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Steven Rostedt , Gabriele Monaco Cc: Nam Cao , Thomas Weissschuh , Tomas Glozar , John Kacur , Wen Yang Subject: [PATCH v2 04/14] tools/rv: Fix cleanup after failed trace setup Date: Thu, 14 May 2026 17:20:45 +0200 Message-ID: <20260514152055.229162-5-gmonaco@redhat.com> In-Reply-To: <20260514152055.229162-1-gmonaco@redhat.com> References: <20260514152055.229162-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-MFC-PROC-ID: 3-9aiVfW7BUrlVzhGQu2sHjtafClS6xY8X0GqexQbEU_1778772090 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Currently if ikm_setup_trace_instance() fails, the tool returns without any cleanup, if rv was called with both -t and -r, this means the reactor is not going to be cleared. Jump to the cleanup label to restore the reactor if necessary. Signed-off-by: Gabriele Monaco --- tools/verification/rv/src/in_kernel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/verification/rv/src/in_kernel.c b/tools/verification/rv/src/in_kernel.c index 95adae321c11..131a6787d639 100644 --- a/tools/verification/rv/src/in_kernel.c +++ b/tools/verification/rv/src/in_kernel.c @@ -809,7 +809,7 @@ int ikm_run_monitor(char *monitor_name, int argc, char **argv) if (config_trace) { inst = ikm_setup_trace_instance(nested_name); if (!inst) - return -1; + goto out_free_instance; } retval = ikm_enable(full_name); -- 2.54.0