linux-kernel - Re: Incomplete cherry-pick on linux-3.3.y branch

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120423212344.GB3378@kroah.com>
Date:	Mon, 23 Apr 2012 14:23:44 -0700
From:	Greg KH <gregkh@...uxfoundation.org>
To:	"H.J. Lu" <hjl.tools@...il.com>
Cc:	LKML <linux-kernel@...r.kernel.org>,
	David Miller <davem@...emloft.net>
Subject: Re: Incomplete cherry-pick on linux-3.3.y branch

On Mon, Apr 23, 2012 at 12:08:13PM -0700, H.J. Lu wrote:
> Hi,
> 
> This cherry-pick commit:
> 
> http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commit;h=1cb41fe7e34a43a1d27dfdb6d65699786dd44c20
> 
> doesn't work on 3.3 branch since it misses other commits
> required.  On 3.3 branch, there are
> 
> struct hist_entry *__hists__add_entry(struct hists *hists,
>                                       struct addr_location *al,
>                                       struct symbol *sym_parent, u64 period)
> {
>         struct rb_node **p;
>         struct rb_node *parent = NULL;
>         struct hist_entry *he;
>         struct hist_entry entry = {
>                 .thread = al->thread,
> 
> It doesn't work with
> 
> diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
> index e11e482..a47a6f1 100644
> --- a/tools/perf/util/hist.c
> +++ b/tools/perf/util/hist.c
> @@ -230,6 +230,18 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
>  		if (!cmp) {
>  			he->period += period;
>  			++he->nr_events;
> +
> +			/* If the map of an existing hist_entry has
> +			 * become out-of-date due to an exec() or
> +			 * similar, update it.  Otherwise we will
> +			 * mis-adjust symbol addresses when computing
> +			 * the history counter to increment.
> +			 */
> +			if (he->ms.map != entry->ms.map) {
> +				he->ms.map = entry->ms.map;
> +				if (he->ms.map)
> +					he->ms.map->referenced = true;
> +			}
>  			goto out;
>  		}
> 
> since entry isn't a pointer on 3.3 branch.

Already fixed in the stable-queue tree, and will show up in the next
kernel release.  If you need a fix now, use the one below.

thanks,

greg k-h

View attachment "perf-fix-build-breakage.patch" of type "text/x-patch" (2068 bytes)