From patchwork Mon Feb 28 23:43:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Tomlin X-Patchwork-Id: 12763870 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 52745C433F5 for ; Mon, 28 Feb 2022 23:43:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231435AbiB1XoS (ORCPT ); Mon, 28 Feb 2022 18:44:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231398AbiB1XoR (ORCPT ); Mon, 28 Feb 2022 18:44:17 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id BA30DECB1C for ; Mon, 28 Feb 2022 15:43:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646091813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wTqJ9ZbJUCgx8VrF++WoBF0cwmRu2Y/rNRNUF4x8BCg=; b=AI37lD+qhzI8vryQpEI6QaBSFV9l/SDE0baZlbvLLotKI55ZIUKVrSwEDCZFNuFoJttogW ffslVZkA4Syut7DCLrXprB4n6CnlPqc5QPXu7uyYKtU4F/WYtsQzwxPVctdJk8S2MxIpT6 5MZUj7UtlBJt8KCrMT1Itu1bnYfG9ow= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-HXZEQz0-OKGU6w8jy21SLg-1; Mon, 28 Feb 2022 18:43:32 -0500 X-MC-Unique: HXZEQz0-OKGU6w8jy21SLg-1 Received: by mail-wr1-f70.google.com with SMTP id j27-20020adfb31b000000b001ea8356972bso2603840wrd.1 for ; Mon, 28 Feb 2022 15:43:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wTqJ9ZbJUCgx8VrF++WoBF0cwmRu2Y/rNRNUF4x8BCg=; b=UVEEca4iVdCWIdse1PptjQw21YsR59FoBt/RamAiHkxWQhHC4kktxLA85RdhGQIYWF Qe53sAVVmhnPsUYKuN4ZF6EoNqxNILZOHQVQjBznVZrmpKsnnAwCTSq3xfjD3xyWOoxn ojAmhBBCMOKQqyAvjOe9B0Evm0Dk6UROOLq63QgDGn7Mmwt2nB0gumFOMYbWZjmDOvSH n9VQgqc5qu7pQetwuQakV+CUlRzFf0X/N3D8ZAMn9J/tTBCx/7PZmh3XJ73EEceNkgcM j3uyvcSg79EcH5XRp7QavyTcshuzWf7TO00pI9gEWy1CK5Uzv3m/2KmGuvEhdbW7LQVO E06w== X-Gm-Message-State: AOAM533GhhKvFCmJ0KIwFpffeCZFB/2oJjDIOhjWk/xGVb30EezHZ05E WWI3a1a2HGTRXDgWeSk3gxMF2BsvNsHba/1Z+zdHoLBU1jnKAB1HsYLjm2I9DU28i4atoYBGc3O jz7A7pzhNak/w5fqHEdJ+F5F5 X-Received: by 2002:a05:6000:15c3:b0:1ea:7db3:8bbe with SMTP id y3-20020a05600015c300b001ea7db38bbemr17241939wry.631.1646091811211; Mon, 28 Feb 2022 15:43:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFIVN4DXfFtc1+AnJv+7X23jet4zoKgQA0S7oIv3vTaCGvypaXYtNE7UqhKl0pZbL0QTuAig== X-Received: by 2002:a05:6000:15c3:b0:1ea:7db3:8bbe with SMTP id y3-20020a05600015c300b001ea7db38bbemr17241922wry.631.1646091811038; Mon, 28 Feb 2022 15:43:31 -0800 (PST) Received: from localhost (cpc111743-lutn13-2-0-cust979.9-3.cable.virginm.net. [82.17.115.212]) by smtp.gmail.com with ESMTPSA id v5-20020a05600c15c500b003810188b6basm708063wmf.28.2022.02.28.15.43.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 15:43:29 -0800 (PST) From: Aaron Tomlin To: mcgrof@kernel.org, christophe.leroy@csgroup.eu, pmladek@suse.com Cc: cl@linux.com, mbenes@suse.cz, akpm@linux-foundation.org, jeyu@kernel.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, void@manifault.com, atomlin@atomlin.com, allen.lkml@gmail.com, joe@perches.com, msuchanek@suse.de, oleksandr@natalenko.name, jason.wessel@windriver.com, daniel.thompson@linaro.org Subject: [PATCH v9 03/14] module: Make internal.h and decompress.c more compliant Date: Mon, 28 Feb 2022 23:43:11 +0000 Message-Id: <20220228234322.2073104-4-atomlin@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220228234322.2073104-1-atomlin@redhat.com> References: <20220228234322.2073104-1-atomlin@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: This patch will address the following warning and style violations generated by ./scripts/checkpatch.pl in strict mode: WARNING: Use #include instead of #10: FILE: kernel/module/internal.h:10: +#include CHECK: spaces preferred around that '-' (ctx:VxV) #18: FILE: kernel/module/internal.h:18: +#define INIT_OFFSET_MASK (1UL << (BITS_PER_LONG-1)) CHECK: Please use a blank line after function/struct/union/enum declarations #69: FILE: kernel/module/internal.h:69: +} +static inline void module_decompress_cleanup(struct load_info *info) ^ CHECK: extern prototypes should be avoided in .h files #84: FILE: kernel/module/internal.h:84: +extern int mod_verify_sig(const void *mod, struct load_info *info); WARNING: Missing a blank line after declarations #116: FILE: kernel/module/decompress.c:116: + struct page *page = module_get_next_page(info); + if (!page) { WARNING: Missing a blank line after declarations #174: FILE: kernel/module/decompress.c:174: + struct page *page = module_get_next_page(info); + if (!page) { CHECK: Please use a blank line after function/struct/union/enum declarations #258: FILE: kernel/module/decompress.c:258: +} +static struct kobj_attribute module_compression_attr = __ATTR_RO(compression); Note: Fortunately, the multiple-include optimisation found in include/linux/module.h will prevent duplication/or inclusion more than once. Fixes: f314dfea16a ("modsign: log module name in the event of an error") Reviewed-by: Christophe Leroy Signed-off-by: Aaron Tomlin --- kernel/module/decompress.c | 3 +++ kernel/module/internal.h | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kernel/module/decompress.c b/kernel/module/decompress.c index d14d6443225a..2fc7081dd7c1 100644 --- a/kernel/module/decompress.c +++ b/kernel/module/decompress.c @@ -113,6 +113,7 @@ static ssize_t module_gzip_decompress(struct load_info *info, do { struct page *page = module_get_next_page(info); + if (!page) { retval = -ENOMEM; goto out_inflate_end; @@ -171,6 +172,7 @@ static ssize_t module_xz_decompress(struct load_info *info, do { struct page *page = module_get_next_page(info); + if (!page) { retval = -ENOMEM; goto out; @@ -256,6 +258,7 @@ static ssize_t compression_show(struct kobject *kobj, { return sysfs_emit(buf, "%s\n", __stringify(MODULE_COMPRESSION)); } + static struct kobj_attribute module_compression_attr = __ATTR_RO(compression); static int __init module_decompress_sysfs_init(void) diff --git a/kernel/module/internal.h b/kernel/module/internal.h index ea8c4c02614c..e0775e66bcf7 100644 --- a/kernel/module/internal.h +++ b/kernel/module/internal.h @@ -6,7 +6,8 @@ */ #include -#include +#include +#include #include #ifndef ARCH_SHF_SMALL @@ -54,7 +55,7 @@ struct load_info { } index; }; -extern int mod_verify_sig(const void *mod, struct load_info *info); +int mod_verify_sig(const void *mod, struct load_info *info); #ifdef CONFIG_MODULE_DECOMPRESS int module_decompress(struct load_info *info, const void *buf, size_t size); @@ -65,6 +66,7 @@ static inline int module_decompress(struct load_info *info, { return -EOPNOTSUPP; } + static inline void module_decompress_cleanup(struct load_info *info) { }