From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B406BEE49A3 for ; Fri, 25 Aug 2023 20:05:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230189AbjHYUF1 (ORCPT ); Fri, 25 Aug 2023 16:05:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230170AbjHYUEy (ORCPT ); Fri, 25 Aug 2023 16:04:54 -0400 Received: from out-244.mta0.migadu.com (out-244.mta0.migadu.com [91.218.175.244]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC9152689 for ; Fri, 25 Aug 2023 13:04:51 -0700 (PDT) Message-ID: <7b87a1b5-238c-bbe2-ab6f-c0c5d643c18f@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1692993887; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hcuN4Dty1PG3JjOON7u0fm7QJOO/fLICXqHfu1XOFMI=; b=rw5/nVmDcC3O45WjJjFwgsaDtmOjvi0seuFc38DHzYAhKdgydwjjoc9WWtlU+bgV2ddjB6 qP8tMGK6YccAct06fPomyaMTYB9yeCaGBaJ4LrZ0lEX3ilu/OKjDrjC5gyXIFgdMXfRbGA nbPLpwkV+01n9isdta98mvf47mmoC2k= Date: Fri, 25 Aug 2023 13:04:39 -0700 MIME-Version: 1.0 Reply-To: yonghong.song@linux.dev Subject: Re: [PATCH] kallsyms: Fix kallsyms_selftest failure Content-Language: en-US To: Kees Cook , Nick Desaulniers Cc: Petr Mladek , Song Liu , Steven Rostedt , Fangrui Song , kernel-team@fb.com, Leizhen , linux-kernel@vger.kernel.org, llvm@lists.linux.dev, kernel test robot References: <20230825034659.1037627-1-yonghong.song@linux.dev> <202308251258.C6770EAA9@keescook> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Yonghong Song In-Reply-To: <202308251258.C6770EAA9@keescook> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/25/23 12:59 PM, Kees Cook wrote: > On Fri, Aug 25, 2023 at 10:51:58AM -0700, Nick Desaulniers wrote: >> On Thu, Aug 24, 2023 at 8:49 PM Yonghong Song wrote: >>> >>> diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c >>> index 016d997131d4..e12d26c10dba 100644 >>> --- a/kernel/kallsyms.c >>> +++ b/kernel/kallsyms.c >>> @@ -188,16 +188,13 @@ static bool cleanup_symbol_name(char *s) >>> >>> static int compare_symbol_name(const char *name, char *namebuf) >>> { >>> - int ret; >>> - >>> - ret = strcmp(name, namebuf); >>> - if (!ret) >>> - return ret; >>> - >>> - if (cleanup_symbol_name(namebuf) && !strcmp(name, namebuf)) >>> - return 0; >>> - >>> - return ret; >>> + /* The kallsyms_seqs_of_names is sorted based on names after >>> + * cleanup_symbol_name() (see scripts/kallsyms.c) if clang lto is enabled. >>> + * To ensure correct bisection in kallsyms_lookup_names(), do >>> + * cleanup_symbol_name(namebuf) before comparing name and namebuf. >>> + */ >>> + cleanup_symbol_name(namebuf); >> >> Hi Yonghong, >> Thanks for your work on this patch. >> So if this change is removing the last place where the return value of >> cleanup_symbol_name is checked, then perhaps this commit should >> additionally change the function signature of cleanup_symbol_name to >> have `void` return type. > > I've landed this in -next as-is just because I want to make sure the bug > gets fixed ASAP, so if this gets adjusted, I can just include that > change on top. Thanks, Kees! I can provide a followup soon.