From patchwork Mon Jun 1 05:57:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11581335 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 60514159A for ; Mon, 1 Jun 2020 05:58:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3CB84206C3 for ; Mon, 1 Jun 2020 05:58:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590991105; bh=7bk6x8xccaqAogJDgl3tIxldH8MtA7Akgx16XVcIwHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RzUuEt7tZnLLsAAwVqDIGGOmoZdt2LnP3IQ4GQFktHr7H7D0u8K95+0+gp+DpnQdg 97Mjl8nwt4+8clWuLgpgnXBfHi1atezjkKU23nYLwLaUlq/r9U8qrRI2kq22KqKNfM LWQDE8Hpodm6Fr+HhhSROzFgDNTamDezGk0gB4jI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727004AbgFAF6Y (ORCPT ); Mon, 1 Jun 2020 01:58:24 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:40006 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727056AbgFAF6V (ORCPT ); Mon, 1 Jun 2020 01:58:21 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-07.nifty.com with ESMTP id 0515vaMG023694; Mon, 1 Jun 2020 14:57:53 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 0515vaMG023694 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1590991073; bh=oCf4bI+4OjqqzXqDWdSRzSLjiycwo5uTHdKWxxwXsSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QC2oqW/HPAHMAnlGn+xt+0sm0t4k4LE2M8Ex1DVt2VVZT+yBpuyk8AeE3HoGmn7XG N9g8ktKcIxIlBPyEZDmqTeebOVl/aR0D/1L3kpwj32kYHAYBASuTcf/YP6A2MV7wCN 1Eh8M7kmwUTjEtTkgylgfAFVdxt5UKZO5hNnPe1GwqXnAdYJKwhvlNmpJW0vNevIxw 5yZoIDvm/mrT00laQqddUIfO/J6hH3hWfOdn1JOfcA09XpUhq2lz4wxf9dECwwb13Z W42zKh/g+BdI3jItvMaeWZbKFDUaKqS3H8QS+v0DlTeLJqT44tw7gscv9ccJuIBAba QXLr+s8gNjrbQ== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada Subject: [PATCH 37/37] modpost: change elf_info->size to size_t Date: Mon, 1 Jun 2020 14:57:31 +0900 Message-Id: <20200601055731.3006266-37-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200601055731.3006266-1-masahiroy@kernel.org> References: <20200601055731.3006266-1-masahiroy@kernel.org> MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Align with the mmap / munmap APIs. Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 9 ++++----- scripts/mod/modpost.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index a3ffabf4eca5..e5cee2367d5e 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -443,7 +443,7 @@ static void sym_set_crc(const char *name, unsigned int crc) s->crc_valid = 1; } -static void *grab_file(const char *filename, unsigned long *size) +static void *grab_file(const char *filename, size_t *size) { struct stat st; void *map = MAP_FAILED; @@ -465,7 +465,7 @@ static void *grab_file(const char *filename, unsigned long *size) return map; } -static void release_file(void *file, unsigned long size) +static void release_file(void *file, size_t size) { munmap(file, size); } @@ -521,9 +521,8 @@ static int parse_elf(struct elf_info *info, const char *filename) /* Check if file offset is correct */ if (hdr->e_shoff > info->size) { - fatal("section header offset=%lu in file '%s' is bigger than " - "filesize=%lu\n", (unsigned long)hdr->e_shoff, - filename, info->size); + fatal("section header offset=%lu in file '%s' is bigger than filesize=%zu\n", + (unsigned long)hdr->e_shoff, filename, info->size); return 0; } diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 1df87d204c9a..efb74dba19e2 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -133,7 +133,7 @@ struct module { }; struct elf_info { - unsigned long size; + size_t size; Elf_Ehdr *hdr; Elf_Shdr *sechdrs; Elf_Sym *symtab_start;