From patchwork Thu Jun 18 23:12:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1312473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49nyTG1lhcz9sNR; Fri, 19 Jun 2020 09:15:14 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jm3kQ-0000kl-Ie; Thu, 18 Jun 2020 23:15:06 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jm3j6-0008O4-Rk for kernel-team@lists.ubuntu.com; Thu, 18 Jun 2020 23:13:44 +0000 Received: from mail-il1-f198.google.com ([209.85.166.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jm3j4-0008SS-Dn for kernel-team@lists.ubuntu.com; Thu, 18 Jun 2020 23:13:42 +0000 Received: by mail-il1-f198.google.com with SMTP id c8so5168297ilm.5 for ; Thu, 18 Jun 2020 16:13:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EM8bBTuEkyO2oujhTLe6kQQeeFf2IhPpwv84qkbRo70=; b=nVmFIxLQtjpAo+x0KZ7YZTvD4qqfg1NfJ7Mwgd/F6BYu3R3myxuWt9AFA4+ue6MwhZ Th8obnvG1PcOkCrh0wnBe5mcXUxW83Z50JSmU6cFJs7IHi9gXkxgmqUkY01qDzKo9lP9 wDJ/2HTF0eFVqZrtBsPU3JXsZaWvyWyCg3HwrM/iAtLOOqAgxHqKtYOjyvdWDQWGZMen M8mCKILiotBIOU3zmYKE0Enygnzll34Q7pPlDoMxJsUDHJ5+mQPiP5ZOVILrNPwCW7vW 2e3/OKuXKxLJu7/lhnYiKY7srkeZ9VzHFdy3KLdx+VnGTp001LOIl7zdXw+mQgkIEIkm 8U+w== X-Gm-Message-State: AOAM531pwnw2Y4OsiECFroEkrw6U0em5xuVvEZYhVXj/SMC5uoIp+xdG UeU/34jcN1f6tQqIW8yhU11I1dNXlnIq4SiEfJmhhjuMtM4/xjHD/icCL7NGDjE8PvnGAzgweWS AXncDimneSBSubdFso3+lsoHrEwea1U4m1aitIGwDrA== X-Received: by 2002:a02:6543:: with SMTP id u64mr1104576jab.26.1592522021229; Thu, 18 Jun 2020 16:13:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwn9J77Uy0wjjr9Ccg7XjExebXRChC9GftsSm7KhKnyfg6FWg4Tl1X9mYMOpcwnW5Boj2BJMg== X-Received: by 2002:a02:6543:: with SMTP id u64mr1104536jab.26.1592522020595; Thu, 18 Jun 2020 16:13:40 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id u2sm2180259ilg.29.2020.06.18.16.13.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2020 16:13:40 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 29/47][X] Annotate hardware config module parameters in drivers/pci/hotplug/ Date: Thu, 18 Jun 2020 18:12:40 -0500 Message-Id: <20200618231258.630575-30-seth.forshee@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200618231258.630575-1-seth.forshee@canonical.com> References: <20200618231258.630575-1-seth.forshee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: David Howells BugLink: https://bugs.launchpad.net/bugs/1884159 When the kernel is running in secure boot mode, we lock down the kernel to prevent userspace from modifying the running kernel image. Whilst this includes prohibiting access to things like /dev/mem, it must also prevent access by means of configuring driver modules in such a way as to cause a device to access or modify the kernel image. To this end, annotate module_param* statements that refer to hardware configuration and indicate for future reference what type of parameter they specify. The parameter parser in the core sees this information and can skip such parameters with an error message if the kernel is locked down. The module initialisation then runs as normal, but just sees whatever the default values for those parameters is. Note that we do still need to do the module initialisation because some drivers have viable defaults set in case parameters aren't specified and some drivers support automatic configuration (e.g. PNP or PCI) in addition to manually coded parameters. This patch annotates drivers in drivers/pci/hotplug/. Suggested-by: Alan Cox Signed-off-by: David Howells Acked-by: Bjorn Helgaas cc: Scott Murray cc: linux-pci@vger.kernel.org (cherry picked from commit 01b961b70dde53b3a5b5062670a19d566e67e78e) Signed-off-by: Seth Forshee --- drivers/pci/hotplug/cpcihp_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c index 66b7bbebe493..d92f5304d67b 100644 --- a/drivers/pci/hotplug/cpcihp_generic.c +++ b/drivers/pci/hotplug/cpcihp_generic.c @@ -220,7 +220,7 @@ module_param(first_slot, byte, 0); MODULE_PARM_DESC(first_slot, "Hotswap bus first slot number"); module_param(last_slot, byte, 0); MODULE_PARM_DESC(last_slot, "Hotswap bus last slot number"); -module_param(port, ushort, 0); +module_param_hw(port, ushort, ioport, 0); MODULE_PARM_DESC(port, "#ENUM signal I/O port"); module_param(enum_bit, uint, 0); MODULE_PARM_DESC(enum_bit, "#ENUM signal bit (0-7)");