LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "tip-bot2 for disconnect3d" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: disconnect3d <dominik.b.czarnota@gmail.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Changbin Du <changbin.du@intel.com>, Jiri Olsa <jolsa@redhat.com>,
	John Keeping <john@metanate.com>,
	Mark Rutland <mark.rutland@arm.com>,
	Michael Lentine <mlentine@google.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Song Liu <songliubraving@fb.com>,
	Stephane Eranian <eranian@google.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>, x86 <x86@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [tip: perf/core] perf map: Fix off by one in strncpy() size argument
Date: Thu, 19 Mar 2020 14:10:45 -0000	[thread overview]
Message-ID: <158462704570.28353.13532501439910836890.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200309104855.3775-1-dominik.b.czarnota@gmail.com>

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     b8fdcfb5a17f1d4fd503caef5c457005a765ecd7
Gitweb:        https://git.kernel.org/tip/b8fdcfb5a17f1d4fd503caef5c457005a765ecd7
Author:        disconnect3d <dominik.b.czarnota@gmail.com>
AuthorDate:    Mon, 09 Mar 2020 11:48:53 +01:00
Committer:     Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Wed, 11 Mar 2020 10:48:44 -03:00

perf map: Fix off by one in strncpy() size argument

This patch fixes an off-by-one error in strncpy size argument in
tools/perf/util/map.c. The issue is that in:

        strncmp(filename, "/system/lib/", 11)

the passed string literal: "/system/lib/" has 12 bytes (without the NULL
byte) and the passed size argument is 11. As a result, the logic won't
match the ending "/" byte and will pass filepaths that are stored in
other directories e.g. "/system/libmalicious/bin" or just
"/system/libmalicious".

This functionality seems to be present only on Android. I assume the
/system/ directory is only writable by the root user, so I don't think
this bug has much (or any) security impact.

Fixes: eca818369996 ("perf tools: Add automatic remapping of Android libraries")
Signed-off-by: disconnect3d <dominik.b.czarnota@gmail.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Changbin Du <changbin.du@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Keeping <john@metanate.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Lentine <mlentine@google.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20200309104855.3775-1-dominik.b.czarnota@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/map.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 9542851..b342f74 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -89,7 +89,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename)
 		return true;
 	}
 
-	if (!strncmp(filename, "/system/lib/", 11)) {
+	if (!strncmp(filename, "/system/lib/", 12)) {
 		char *ndk, *app;
 		const char *arch;
 		size_t ndk_length;

      parent reply	other threads:[~2020-03-19 14:12 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-09 10:48 [PATCH] Fix off by one in tools/perf strncpy " Dominik 'disconnect3d' Czarnota
2020-03-09 12:39 ` Arnaldo Carvalho de Melo
2020-03-09 12:48   ` Arnaldo Carvalho de Melo
2020-03-19 14:04 ` [tip: perf/urgent] perf map: Fix off by one in strncpy() " tip-bot2 for disconnect3d
2020-03-19 14:10 ` tip-bot2 for disconnect3d [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=158462704570.28353.13532501439910836890.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=acme@redhat.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=changbin.du@intel.com \
    --cc=dominik.b.czarnota@gmail.com \
    --cc=eranian@google.com \
    --cc=john@metanate.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mlentine@google.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=songliubraving@fb.com \
    --cc=x86@kernel.org \
    --subject='Re: [tip: perf/core] perf map: Fix off by one in strncpy() size argument' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).