Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3363559imu; Wed, 7 Nov 2018 09:10:36 -0800 (PST) X-Google-Smtp-Source: AJdET5fir7bxb8yG7fMSvSr2lNx0XwwV2vtVU48rI7TQbtm5kraE9mpx0lTRktbFm6TyXG/vmRvy X-Received: by 2002:a63:205:: with SMTP id 5mr843448pgc.327.1541610636774; Wed, 07 Nov 2018 09:10:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541610636; cv=none; d=google.com; s=arc-20160816; b=KqbM3vrvG9piUdQmqYDSjI3ywHVFnFi4XtLNyNzryP+XSoDJOKcaeNghP3ddvG1u5e 6iERidPxXw9IM4Jx9UjyNDEe2zGxzdN1y2fQr610Cy46WZRV9BmPhd1WCca06ABDw0VV 2b0EX//1knS0pjqIb8B2gY16blpjyOVIkaGuRRKP4sVBaCHNBJTbq3hDn35n02CfzOOl k5meh7sMqV2O7YSunNrvRYITdFC5PgOHnRVgEg2T0bGTRd1OMO9W/KXOETeQgRfqH5H4 Lhr6zL+Kz2x93lmY9Tlq59VBaV3YjOFVDxMyU1w+aP1h1VtOPySNYF6uoFokJrvQd72D aoeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=4GNK2een3w4s3ctlJRSH9Se/9mNo62ofmOMJNcNLdtk=; b=pFRSjnmVMRL8UVamAyXwc70PfV9R0/6hMpvcvS+Rx2rveRdT2aDgpJGJjep3vzP0gC M0Ja/rtsVgD8poNXVBTN1r2PxCwMqGfDtBbihS60QiYdz0txaK3pImhArVPyRrSfCWcr G1T4J4y9gLvjCp1E3w2dOuFaKet1otBlWx3wKXhu7xKmxD82IM5ioCBnwVbwecEiHgUM bKiWOizpvqmnWI8wd4q/fwHYnyI2kxdF2eYF6CJ1d9NMLAJxJm9bKjg753zdzQe/QPyf Xtwk4nyg8f68dHtL1u7vbRV7o2B7RJlVu6IqCxf6dvXhWVgfT8aV3/+RUKf++AYPDptk 5VBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f23-v6si939014pgl.207.2018.11.07.09.10.21; Wed, 07 Nov 2018 09:10:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731410AbeKHCkS (ORCPT + 99 others); Wed, 7 Nov 2018 21:40:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57382 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727757AbeKHCkS (ORCPT ); Wed, 7 Nov 2018 21:40:18 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C4975307CDC2; Wed, 7 Nov 2018 17:09:02 +0000 (UTC) Received: from treble (ovpn-121-72.rdu2.redhat.com [10.10.121.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C64B118EC6; Wed, 7 Nov 2018 17:08:58 +0000 (UTC) Date: Wed, 7 Nov 2018 11:08:56 -0600 From: Josh Poimboeuf To: Artem Savkov Cc: Peter Zijlstra , linux-kernel@vger.kernel.org Subject: Re: [PATCH] objtool: fix .cold. functions parent symbols search Message-ID: <20181107170856.usgyzckfirem5qh7@treble> References: <20181107140559.28504-1-asavkov@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20181107140559.28504-1-asavkov@redhat.com> User-Agent: NeoMutt/20180716 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 07 Nov 2018 17:09:02 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 07, 2018 at 03:05:59PM +0100, Artem Savkov wrote: > The way it is currently done it is possible for read_symbols() to find the > same symbol as parent for ".cold" functions. I seem to remember having this discussion for kpatch-build, but I forget the details. Can you explain how this can happen (and also add that detail to the commit message)? I haven't seen any bug reports, is it purely theoretical? > This leads to a bunch of > complications such as func length being set to 0 and a segfault in > add_switch_table(). Fix by copying the search string instead of modifying > it in place. > > Signed-off-by: Artem Savkov > --- > tools/objtool/elf.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c > index 6dbb9fae0f9d..781c8afb29b9 100644 > --- a/tools/objtool/elf.c > +++ b/tools/objtool/elf.c > @@ -298,6 +298,7 @@ static int read_symbols(struct elf *elf) > /* Create parent/child links for any cold subfunctions */ > list_for_each_entry(sec, &elf->sections, list) { > list_for_each_entry(sym, &sec->symbol_list, list) { > + char *pname; > if (sym->type != STT_FUNC) > continue; > sym->pfunc = sym->cfunc = sym; > @@ -305,9 +306,9 @@ static int read_symbols(struct elf *elf) > if (!coldstr) > continue; > > - coldstr[0] = '\0'; > - pfunc = find_symbol_by_name(elf, sym->name); > - coldstr[0] = '.'; > + pname = strndup(sym->name, coldstr - sym->name); > + pfunc = find_symbol_by_name(elf, pname); > + free(pname); > > if (!pfunc) { > WARN("%s(): can't find parent function", > -- > 2.17.2 > -- Josh