From patchwork Mon Jun 14 10:28:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 459835 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp3190971jae; Mon, 14 Jun 2021 04:24:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxC3FmfjSl9A4XhaHHTOlcdNsb56lRBAQaQUpK+SHcOmIW1N1+TFwciBuqeXLPbqzPSeQXB X-Received: by 2002:a50:bf0f:: with SMTP id f15mr16209017edk.205.1623669878459; Mon, 14 Jun 2021 04:24:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623669878; cv=none; d=google.com; s=arc-20160816; b=GBMXCZ4bJQbgGMrMdw1rzLRohB1bPgE94IJkw28MajRGkjUWqbWb1FOd/0P03BXKA4 s56Knw10F2Pm7fiYmbIMtPAfP/bCpoFol3pykh7cYhLXoYTrTWTZoGvpfaAye6aWcJMx tyJoyTue12tknJijzoP0NZszlZjkBqSMKcYCdZYSAWACIXwVTl87R9jRoHq/merDfDk2 /W6B0w7yT5EBmvxHzoQ43XCm6YRZ6g1IzrsM0K4xfWpzlMvx34xl7gAIfc/cErkmvo2v Ajf+jEHA070d2DZw1wYT3d0+HwPSkV511ZqbU4PKiBhxTNuELtraxMdon9nv/dnITK/w BYGA== 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=HPcyf7miexE/sDZCN05YjoSEUtke0+2Bo2WRj7OHQQo=; b=nYjJhi4hUdEsmtybn5xG3pjwGBqu2IevXM51D7FfkudOvcKpanmsraBf1pUCdBXXDl LjKz/nZLpk01RVuUQivj8N8BD2azzQo+tOwDsf4ao6/Kp+MugZauIPMSoOidy21j5w7d /v1upocHT+7NzI3rY5Ga4TyQBWlKjQehBEXWDDM9qTe9AaAj0jdbHHWK7qV9H+g17rpG Ih/hzk7QMWR6iDbDMQTgTooSUIpcB60LD8By8oOemQ7u6IKgMBzYLrV758UiWRXqwzbV kHOeZqE5pxJ1c16o8WBBiRzMv39Pxk4PUO+Q52QlLuLFwHx+myH4Ip5n48nB79ppAYbW oH0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tEdbrruV; 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 i9si7011152ejc.423.2021.06.14.04.24.38; Mon, 14 Jun 2021 04:24:38 -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=tEdbrruV; 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 S235539AbhFNL0e (ORCPT + 12 others); Mon, 14 Jun 2021 07:26:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:52646 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236287AbhFNLYh (ORCPT ); Mon, 14 Jun 2021 07:24:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0F63561420; Mon, 14 Jun 2021 10:54:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623668061; bh=+S26NXupBNYwW4jLPGEWnQrtsAe1QHkXvjky6ruhTDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tEdbrruVnpeCNT7PZp2/Yyazzz/IGLeekxeTB/FRXTV/Er+IYkhmWZnMRzRo7TVxa mCwSo9A40YKSxe/hksTjoduFBiMOCHBiFmaxg0WSUXuBeluA6dhwid8oQOxzCSangq GqI+z0ZuTn8j1rdbYCNVbzMIz62wkz0TsOGp3a2A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leo Yan , Adrian Hunter , Jiri Olsa , Alexander Shishkin , Kan Liang , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.12 165/173] perf session: Correct buffer copying when peeking events Date: Mon, 14 Jun 2021 12:28:17 +0200 Message-Id: <20210614102703.660455562@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102658.137943264@linuxfoundation.org> References: <20210614102658.137943264@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 197eecb6ecae0b04bd694432f640ff75597fed9c ] When peeking an event, it has a short path and a long path. The short path uses the session pointer "one_mmap_addr" to directly fetch the event; and the long path needs to read out the event header and the following event data from file and fill into the buffer pointer passed through the argument "buf". The issue is in the long path that it copies the event header and event data into the same destination address which pointer "buf", this means the event header is overwritten. We are just lucky to run into the short path in most cases, so we don't hit the issue in the long path. This patch adds the offset "hdr_sz" to the pointer "buf" when copying the event data, so that it can reserve the event header which can be used properly by its caller. Fixes: 5a52f33adf02 ("perf session: Add perf_session__peek_event()") Signed-off-by: Leo Yan Acked-by: Adrian Hunter Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Kan Liang Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20210605052957.1070720-1-leo.yan@linaro.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/session.c | 1 + 1 file changed, 1 insertion(+) -- 2.30.2 diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index e9d4e6f4bdf3..b7cfdbf207b7 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1710,6 +1710,7 @@ int perf_session__peek_event(struct perf_session *session, off_t file_offset, if (event->header.size < hdr_sz || event->header.size > buf_sz) return -1; + buf += hdr_sz; rest = event->header.size - hdr_sz; if (readn(fd, buf, rest) != (ssize_t)rest)