From patchwork Mon Apr 26 07:29:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 427523 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6d12:0:0:0:0 with SMTP id m18csp3586709ejr; Mon, 26 Apr 2021 00:42:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0GuPFf+RHPFc/D+AHwbHaBjI7OWXuEM3bppKNgPAybIhwNmJ8TNXszfKhP4BimGz9AKty X-Received: by 2002:a17:902:9345:b029:e7:4853:ff5f with SMTP id g5-20020a1709029345b02900e74853ff5fmr17388168plp.74.1619422878027; Mon, 26 Apr 2021 00:41:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619422878; cv=none; d=google.com; s=arc-20160816; b=GnxXgbfPNC9rzCksHPUva1ap1qxZhX7YIlU15n9NQusYHyQePvPi57ew8JhQFGNcSj j7bBH62itHh1dNan5fML8jdufNcGEzJ6837zT9Jf5VyLV5r0YX855I0J69YcWh1yvyXH DrctfR1d6HAlFrw0d64licvM5rCeNQ+SmTzQBNH1zy4s1Jd97HJAS+au3ABAglJOq+2u 3g5fojH5HnSjmMxeo7+CRIOX4L4cNGDwOn+1elcPvd85j8raR+jPTdQ8ytaFHKD5j9oG Lpez66SIxcwPUuqiDN0+EUB/CEzBtq9earW7W6n/rb8ydsuQVnsAaMhJAJIFVhkVBpBw hYaQ== 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=LYhr/YVz2l2/Fci50WFGfBCJ2WAUOVMrvNQwx4IGzDU=; b=USzhQ15JiZ7K/pB2X//y+hFZaVkH+9DpiX8xMa0rY/ZmQUNsMs0uxvsbnUcB3v4UUy f12eSg3ik78Va6sTX/pwHW8VH16Srvcm05+xmriNjVyn/EbCvbwmk9QRB+3/Tes422+Z OGVDQ0TRcfiPDZUA7NzzaK5CsMk6xwYscSXqQU6kp4cFZlcbwMRj6CpzSaMtPz4+WV3s OjhANx63j53c3LKH4hSvTKShgZeJnBgnqNS4DvYKfU6d5Ew6uCk2ERSs2LPY42Twqn// BrDp2OvXxdCwTGy3whLvgn58NK8ZFrjgGHzv0K1qqEDAm6VjRVVbphd3Bis42/hJWaWb p5Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IiEZHQ9N; 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.41.17; Mon, 26 Apr 2021 00:41:18 -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=IiEZHQ9N; 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 S232986AbhDZHlz (ORCPT + 12 others); Mon, 26 Apr 2021 03:41:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:50350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232788AbhDZHjt (ORCPT ); Mon, 26 Apr 2021 03:39:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 617FD613E3; Mon, 26 Apr 2021 07:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1619422711; bh=WA+hp9zzQ6k702CVT4hO1F/VsZZ0r5aaOv+Hng2CqMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IiEZHQ9NKXByavmcMk0aB7U5Pkr+Qw1KUx21nFxYfG4XFkkH02fh/+T53y4BgI8jO mOaJBdAA7l6LzNGcZ8cZUs5pqqlG8guawEjx/7zEBKZxaYPz/A9limbBj/gW0f0AAh wi23SR+Hnw21960Sl4EKH3/xJOofr2c2AonhFe48= 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.4 08/20] perf auxtrace: Fix potential NULL pointer dereference Date: Mon, 26 Apr 2021 09:29:59 +0200 Message-Id: <20210426072816.958871353@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426072816.686976183@linuxfoundation.org> References: <20210426072816.686976183@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 61b8dc45428f..ae5b97427192 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -586,7 +586,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");