Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1822606ybv; Fri, 14 Feb 2020 06:38:24 -0800 (PST) X-Google-Smtp-Source: APXvYqzDs6PdcET9xM7z/Vv7/onPdOlLlAKr9FYnBd0TrniF4eiu2wa7no/ShVcpPz3MWXxcjCrI X-Received: by 2002:a9d:53cb:: with SMTP id i11mr2621743oth.158.1581691104751; Fri, 14 Feb 2020 06:38:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581691104; cv=none; d=google.com; s=arc-20160816; b=PLuQPZ0GydlOFe4bT4/0+RH2sA4I8e4kis1BlBN98OCSDs86A1hJKkCMLMOMYxrz+5 T/+TXBdyrhpIb5f5D3JN7Sd5tL0U9wFEBpXa/NX7TnnRNsqRQZzQsczm20XoaKebO7ns FUiJz9Fe9eyJP/EA6YzXaCGxiyd5KHSjHjAqeHE4U7sCu3ttVQKj9n+D0R1SaFjaLDpL pByU8d2mfcKffgBp+cwGKBW5GYX0SRejmab/NmXzfal9PzZmxtuhSDuR08aphArzWgm9 kGb9HJ9VJo5+rRXqzlaHFPcjFFSOMl4111D9iE9znPs93ERRc7pNmv5QYXgreywFTVRK xaNQ== 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; bh=vcvsUoOw3IUCju9Kj4qfnZMJ0hahuBi/gZADmuO+2AQ=; b=Yi0cb+USkMamdzoYlQkowzfb96tI9RoDRwxbEMcg+vPpxUVDvqKqVV/CgSTo7CJkGy eX1GT/8mk5bIZ0VLRgoxts5wzkcNk4+stp56Ai0KhCiSJyr0mZir8OEgZLy290Vlm/0v DlqmcevoIV+2Dv2Z+5OACPfWdJ3B+fzYttpXL+ZdS6R527q+2uw1vclfInIWhjcrKeHU TL2lNiedJ+iySSK4t1aeQcyu82OD8/7UBBLvwiRtCDVf6sm0W0XZobpZFjO2Ia1Qj+B+ tGzLphgubhJK13rAqzyo4Poeq3hWWCtP/bxdFFfm6mY6iqe1UoCx7Owkl8tnF3qf+bSP VnOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xWnvJcBi; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i6si3019221otp.5.2020.02.14.06.38.10; Fri, 14 Feb 2020 06:38:24 -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; dkim=pass header.i=@kernel.org header.s=default header.b=xWnvJcBi; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729256AbgBNOhe (ORCPT + 99 others); Fri, 14 Feb 2020 09:37:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:36942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728557AbgBNOhe (ORCPT ); Fri, 14 Feb 2020 09:37:34 -0500 Received: from linux-8ccs.suse.de (p5B2812F9.dip0.t-ipconnect.de [91.40.18.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 63B7F2187F; Fri, 14 Feb 2020 14:37:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581691053; bh=yOTBUEtRaOoo+HtA7SV7d16J3SPYJC3G4vpshmRKMC4=; h=From:To:Cc:Subject:Date:From; b=xWnvJcBixIZdxmqiLT5vcGzW7TLNhm09zb0fhJO+WtQQBJTW06vxnoZMYTcWj/5n7 08vynHuSoHBe8hQqOdggfqbdlnmjDZPUsgJ57ewUVlvVVtK0oUz4JVPVnXP1HPfzvJ MqEY71eirmAAPpQ4XTnATUz3ZD4yRIEy68y3c9nk= From: Jessica Yu To: Masahiro Yamada , Matthias Maennich Cc: linux-kernel@vger.kernel.org, Jessica Yu Subject: [PATCH] modpost: return error if module is missing ns imports and MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n Date: Fri, 14 Feb 2020 15:37:09 +0100 Message-Id: <20200214143709.6490-1-jeyu@kernel.org> X-Mailer: git-send-email 2.16.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently when CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n, modpost only warns when a module is missing namespace imports. Under this configuration, such a module cannot be loaded into the kernel anyway, as the module loader would reject it. We might as well return a build error when a module is missing namespace imports under CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n, so that the build warning does not go ignored/unnoticed. Signed-off-by: Jessica Yu --- scripts/Makefile.modpost | 1 + scripts/mod/modpost.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index b4d3f2d122ac..a53660f910a9 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -53,6 +53,7 @@ MODPOST = scripts/mod/modpost \ $(if $(KBUILD_EXTMOD),$(addprefix -e ,$(KBUILD_EXTRA_SYMBOLS))) \ $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ + $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS),,-N) \ $(if $(KBUILD_MODPOST_WARN),-w) ifdef MODPOST_VMLINUX diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 7edfdb2f4497..53e966f7d557 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -39,6 +39,8 @@ static int sec_mismatch_count = 0; static int sec_mismatch_fatal = 0; /* ignore missing files */ static int ignore_missing_files; +/* Return an error when there are missing namespace imports */ +static int missing_ns_import_error = 0; enum export { export_plain, export_unused, export_gpl, @@ -2216,9 +2218,15 @@ static int check_exports(struct module *mod) if (exp->namespace && !module_imports_namespace(mod, exp->namespace)) { - warn("module %s uses symbol %s from namespace %s, but does not import it.\n", - basename, exp->name, exp->namespace); - add_namespace(&mod->missing_namespaces, exp->namespace); + if (missing_ns_import_error) { + merror("module %s uses symbol %s from namespace %s, but does not import it.\n", + basename, exp->name, exp->namespace); + err = 1; + } else { + warn("module %s uses symbol %s from namespace %s, but does not import it.\n", + basename, exp->name, exp->namespace); + } + add_namespace(&mod->missing_namespaces, exp->namespace); } if (!mod->gpl_compatible) @@ -2560,7 +2568,7 @@ int main(int argc, char **argv) struct ext_sym_list *extsym_iter; struct ext_sym_list *extsym_start = NULL; - while ((opt = getopt(argc, argv, "i:e:mnsT:o:awEd:")) != -1) { + while ((opt = getopt(argc, argv, "i:e:mnsT:o:awENd:")) != -1) { switch (opt) { case 'i': kernel_read = optarg; @@ -2598,6 +2606,9 @@ int main(int argc, char **argv) case 'E': sec_mismatch_fatal = 1; break; + case 'N': + missing_ns_import_error = 1; + break; case 'd': missing_namespace_deps = optarg; break; -- 2.16.4