From patchwork Wed Aug 9 03:18:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 109690 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp305220qge; Tue, 8 Aug 2017 20:21:35 -0700 (PDT) X-Received: by 10.98.144.209 with SMTP id q78mr6752364pfk.81.1502248895364; Tue, 08 Aug 2017 20:21:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502248895; cv=none; d=google.com; s=arc-20160816; b=BrtkS6TenxmEhwtdSwDVVPZBKCchYzgepElCdCL5Nb2AvJX9cckkhmwS9eVw6DxW22 /y7CcbOyf6ghiOyzfcERKXY86byxnTjZM4DynL90y4iU0Q/aFjjzb7Hp3Zm6sS347Jra mcJQiNslDljct8YZj/bDQ4tRv6oqJjT2ngBvssQIC4csuJ7odDSvb70Yk3XXOgP9mqF2 kt6CzVExQSSI09ppXavuup4ViVoxoUfkvBvvxGtOQlZ++W/RnOIfwweiE+y9M0TO8UBt Po9Mc5upXWuyQE3b7ct6vQ7CjFXB4YgAeZo0exlHJ+mK++Hw0txVoYqW3ogZ/yBlRDCE FZfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=zRbVXpjuV3CDj83IvXXPfhNBU/afHopOLw3FVWYn+kM=; b=Cd5RvtPhlZeL1laD6JP4CeJH0q0y7Xle3LfoNJm3kPhRv9KPoppK2ikEkCxBvz0bjL Ni6c8P7KwmcL+uwRbhu6uibSIcGfAQ80fAf55G4EXQ5OFbEjsVrCTT4/+9Wpbo6yu8iB RJfQeoDZyFCpGF839WgluIgj67RU5PFzDMHhsJ9PmOJyx6/LPOmHF1yi9BNJLa8tqLVv xLagL+mBQvGKas4l4KSCBSCpJtneF6Q2utK/xY7c1Ysr9Y3vy1pc6P97u8az2hpojVgd Un8TtWuOVEsA8Gt90QYPiU4CNnKY4KlNq8X3qH9lVP7SKGLtArCq+skjHp21yheANweh 0lIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vMuiNLXM; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r11si2013426plj.547.2017.08.08.20.21.34; Tue, 08 Aug 2017 20:21:35 -0700 (PDT) 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; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vMuiNLXM; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752581AbdHIDVb (ORCPT + 25 others); Tue, 8 Aug 2017 23:21:31 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:55408 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752356AbdHIDV3 (ORCPT ); Tue, 8 Aug 2017 23:21:29 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id v793KEvu027692; Wed, 9 Aug 2017 12:20:15 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v793KEvu027692 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1502248815; bh=zRbVXpjuV3CDj83IvXXPfhNBU/afHopOLw3FVWYn+kM=; h=From:To:Cc:Subject:Date:From; b=vMuiNLXMJhzQlQJoEhpK/IT/E2NzzdsheuTEs8l1QqWLy+aIpoKCWcygwDuauEnpX tCzTkuZyhO+tq8BYeo30iRk2hmQidQ3SHpVysQdkEMDnbypThgaio5y2MEQxBDJTXy is9y/OfirIbdvPHggqNEbUlhGCu0CdLwVXtFSpGJO943VGaWygyOhdYip6g2ZPhZiP FXh6kpU+aGlyTuVznPFDelIcoG2UwUHuTWBAf6Xo4VUNG/ioDBHo6FDzFE4l3q5jz3 s6QXQG/j5fXsHjMv4kjCnwg/8wVlmERCYRo1uRt4qNPLaS/LpkW6zhRmfHwC/3/0Ft xWjRs1YdZqwFA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Nicholas Piggin , Jessica Yu , Kees Cook , Chris Metcalf , Heinrich Schuchardt , Ingo Molnar , Ard Biesheuvel , Andrew Morton Subject: [PATCH] modpost: simplify sec_name() Date: Wed, 9 Aug 2017 12:18:41 +0900 Message-Id: <1502248721-22009-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is code duplication between sec_name() and sech_name(). Simplify sec_name() by re-using sech_name(). Also, move them up to remove the forward declaration of sec_name(). Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) -- 2.7.4 Reviewed-by: Kees Cook diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 48397feb08fb..b920d186ad4a 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -261,7 +261,17 @@ static enum export export_no(const char *s) return export_unknown; } -static const char *sec_name(struct elf_info *elf, int secindex); +static const char *sech_name(struct elf_info *elf, Elf_Shdr *sechdr) +{ + return (void *)elf->hdr + + elf->sechdrs[elf->secindex_strings].sh_offset + + sechdr->sh_name; +} + +static const char *sec_name(struct elf_info *elf, int secindex) +{ + return sech_name(elf, &elf->sechdrs[secindex]); +} #define strstarts(str, prefix) (strncmp(str, prefix, strlen(prefix)) == 0) @@ -775,21 +785,6 @@ static const char *sym_name(struct elf_info *elf, Elf_Sym *sym) return "(unknown)"; } -static const char *sec_name(struct elf_info *elf, int secindex) -{ - Elf_Shdr *sechdrs = elf->sechdrs; - return (void *)elf->hdr + - elf->sechdrs[elf->secindex_strings].sh_offset + - sechdrs[secindex].sh_name; -} - -static const char *sech_name(struct elf_info *elf, Elf_Shdr *sechdr) -{ - return (void *)elf->hdr + - elf->sechdrs[elf->secindex_strings].sh_offset + - sechdr->sh_name; -} - /* The pattern is an array of simple patterns. * "foo" will match an exact string equal to "foo" * "*foo" will match a string that ends with "foo"