From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753319AbcFLDVC (ORCPT <rfc822;w@1wt.eu>);
	Sat, 11 Jun 2016 23:21:02 -0400
Received: from mail.kernel.org ([198.145.29.136]:36984 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752651AbcFLDVB (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sat, 11 Jun 2016 23:21:01 -0400
Date: Sun, 12 Jun 2016 12:20:50 +0900
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>, linux-kernel@vger.kernel.org,
        Namhyung Kim <namhyung@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>,
        Hemant Kumar <hemant@linux.vnet.ibm.com>,
        Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>,
        Brendan Gregg <brendan.d.gregg@gmail.com>
Subject: Re: [PATCH perf/core v10 09/23] perf probe: Show all cached probes
Message-Id: <20160612122050.8c9011e6d6633643d31498b2@kernel.org>
In-Reply-To: <20160611092809.208a12b5d99cf2cfc62126df@kernel.org>
References: <20160608092854.3116.29007.stgit@devbox>
	<20160608093030.3116.74450.stgit@devbox>
	<20160609142255.GP11589@kernel.org>
	<20160611092809.208a12b5d99cf2cfc62126df@kernel.org>
X-Mailer: Sylpheed 3.4.3 (GTK+ 2.24.28; x86_64-redhat-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sat, 11 Jun 2016 09:28:09 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:

> On Thu, 9 Jun 2016 11:22:55 -0300
> Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> 
> > Em Wed, Jun 08, 2016 at 06:30:30PM +0900, Masami Hiramatsu escreveu:
> > > +char *build_id_cache__origname(const char *sbuild_id)
> > > +{
> > > +	char *linkname;
> > > +	char buf[PATH_MAX];
> > > +	char *ret = NULL, *p;
> > > +	size_t offs = 5;	/* == strlen("../..") */
> > > +
> > > +	linkname = build_id_cache__linkname(sbuild_id, NULL, 0);
> > > +	if (!linkname)
> > > +		return NULL;
> > > +
> > > +	if (readlink(linkname, buf, PATH_MAX) < 0)
> > > +		goto out;
> > > +	/* The link should be "../..<origpath>/<sbuild_id>" */
> > > +	p = strrchr(buf, '/');	/* Cut off the "/<sbuild_id>" */
> > > +	if (p && (p > buf + offs)) {
> > > +		*p = '\0';
> > > +		if (buf[offs + 1] == '[')
> > > +			offs++;	/*
> > > +				 * This is a DSO name, like [kernel.kallsyms].
> > > +				 * Skip the first '/', since this is not the
> > > +				 * cache of a regular file.
> > > +				 */
> > > +		ret = strdup(buf + offs);	/* Skip "../..[/]" */
> > 
> > strdup can fail.
> 
> Ah, right.

In this case, build_id_cache__origname() returns ret immediately(see below),
so we don't need to take reaction about that :)

> > > +	}
> > > +out:
> > > +	free(linkname);
> > > +	return ret;
> > > +}

here, if strdup() fails, this just return NULL. that is OK.

Thanks!
-- 
Masami Hiramatsu <mhiramat@kernel.org>