From patchwork Mon Apr 26 07:29:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427526 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6d12:0:0:0:0 with SMTP id m18csp3587898ejr; Mon, 26 Apr 2021 00:44:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzh0FSA+Jaw+lvTv7VNbFAolhRvMoekb4n6Khy5xx3Cs+v2AaLU4Gl8l+df+COGxD+/Ax/ X-Received: by 2002:a63:1b5e:: with SMTP id b30mr15542269pgm.254.1619422978902; Mon, 26 Apr 2021 00:42:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619422978; cv=none; d=google.com; s=arc-20160816; b=cFxomcPYJrAHlfbBhMMsR6W8FoH+xQ0uU6KccN0HnYvFmjN3JUCWHf6JdLPPZgis04 JwVSHaIboU5I1EBQxFT/BNUfgxVwrrfHjNIju+YV/3iY8Lu5xj7YurPeBnQ1aHLbI2RO 2d4k8qewOvzhZsUORSmXYasvBmNWEp5W34AjDH9RQCWuWBlkYaFnWjNG7c1ei48VYA71 UYdxIz/gz0VAWc+59/9h1QYVRea9TXt1DfuO2iVqMI0llCQ4e9uYU4X6MBHhq27+sc5p BGtp/XMxTcr4Ky44RY0X1k9YVQ5lAlBr01eO36nOox879icvNWnMvpFADKg+8F8tpIH5 eywg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tV9e3gLTB3zACkoNEch/hKKT3dOUuO7hzAQ2vfox/FI=; b=ReaYHLSH+O3ZBwidTajyhI5ssk2wNrh/1PIxM196MfXYd2uv5ca8ipFUl3iQFOG0iA R3K3dIsfG/wF1+txoW4sEvWtG7yyQyVRJB/Ek7rP6f3o7ONMiclaOFw+imRoDvGwmZZ6 r8iRv1jNZxjLi0JbEKnj44vw1+ZTuQLvowLGdKLpa0FyDhWncCSCnsdpFuzvjNE4tJTg SVS3Kfbmc+kI+yEMRniV9XVklwwWOZ0l+BZqKrl5BGaKSjuh+dshozeUo5ewLZ6mHx+M gyIn7c6/j4Cz6wZSGerpAa/HAKeUCYCGk5ezcMfg3sHwor9D9PeflRlWiYcukIU3fqv4 3Nkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ILyK4pet; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u27si17120814pgl.205.2021.04.26.00.42.58; Mon, 26 Apr 2021 00:42:58 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=ILyK4pet; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233444AbhDZHnh (ORCPT + 12 others); Mon, 26 Apr 2021 03:43:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:60148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233459AbhDZHlu (ORCPT ); Mon, 26 Apr 2021 03:41:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 70246613AF; Mon, 26 Apr 2021 07:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422757; bh=zAgo88+hqQFP8MeP6wbx6FNplEoNlK4DeHeoK5/GuhY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ILyK4petjasTdlTCA3Tu4XLCx7WEjNfSFib0SoqykDGJ9PNoZjbuKEvzEskLL1GH/ 7eNLVkIe2z9FFuLgVAsfe46Enev9DD59xc8+gH6PL5ZTLULvT7wEsme7tRUXWlezQk FEUkaBUZpNz/7RXNTE1euZs5Bk+zolCmbRJijbJU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leo Yan , Adrian Hunter , Alexander Shishkin , Andi Kleen , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Tiezhu Yang , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.10 16/36] perf auxtrace: Fix potential NULL pointer dereference Date: Mon, 26 Apr 2021 09:29:58 +0200 Message-Id: <20210426072819.338696417@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072818.777662399@linuxfoundation.org> References: <20210426072818.777662399@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Leo Yan [ Upstream commit b14585d9f18dc617e975815570fe836be656b1da ] In the function auxtrace_parse_snapshot_options(), the callback pointer "itr->parse_snapshot_options" can be NULL if it has not been set during the AUX record initialization. This can cause tool crashing if the callback pointer "itr->parse_snapshot_options" is dereferenced without performing NULL check. Add a NULL check for the pointer "itr->parse_snapshot_options" before invoke the callback. Fixes: d20031bb63dd6dde ("perf tools: Add AUX area tracing Snapshot Mode") Signed-off-by: Leo Yan Acked-by: Adrian Hunter Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Tiezhu Yang Link: http://lore.kernel.org/lkml/20210420151554.2031768-1-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/auxtrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index d8ada6a3c555..d3c15b53495d 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -636,7 +636,7 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr, break; } - if (itr) + if (itr && itr->parse_snapshot_options) return itr->parse_snapshot_options(itr, opts, str); pr_err("No AUX area tracing to snapshot\n");