From patchwork Fri Jun 19 16:15:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1313069 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 49pP7w4Cd0zB46w; Sat, 20 Jun 2020 02:16:44 +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 1jmJh0-0002D4-T8; Fri, 19 Jun 2020 16:16:38 +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 1jmJgv-00028l-Ag for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:16:33 +0000 Received: from mail-il1-f200.google.com ([209.85.166.200]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmJgu-0003Zo-Th for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:16:33 +0000 Received: by mail-il1-f200.google.com with SMTP id a4so6821860ilq.2 for ; Fri, 19 Jun 2020 09:16:32 -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=dLvxkhn3bA30ypWAEYKfeHm/e/CerthZlVTzfMbd5yw=; b=QW0zfV3HQqTKQkQ3XgAuMrXPS56ciVXkXG6vBgBq7DFR6qJ+KWMrxKMNskUz986WK1 U8UQUvKD7WEwGQZdmBCpGfcKS4H+dkdXwPGzkOZbwXYDhd0UZwEAkVIyBkFzBVifTGmL eFs3i1MZVh1+IyCgLTiInwEHg6gmuPo1Mn41DgOI4hF79/WeGw/b7Ss3HrGv7ZcCAteK mkmFdZGUVmoqKmaJYVo3eVL8Gf9kCLntl5krwRn2OTHYd1MXnIZho26fNMlknk3iqyVw B2ROi00ekmhxPgP/xUBmKw8ugzdhdP5BKhZzGZ6baWHurfKhkE7ETk5aB8N0lCrqBnqa XzOA== X-Gm-Message-State: AOAM531rjnNX6bhVJ5qYNKU0ebdVI4h2aI2GjwrkwOGSAY4UFqDQMY02 NAyriRx4pm7WafvNABXYbkjxBWrLOkaDDpr0FJeD1vRV+A8w+hg0nKNWc1Dtu9oA0eAGvK/+LEB 2UqZKhIC+7cvmCwwIrNzoBGyTpkGWPpN7t8vi0CLfPA== X-Received: by 2002:a92:a1c9:: with SMTP id b70mr4474211ill.198.1592583391829; Fri, 19 Jun 2020 09:16:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkDCkmfSlwxAng6opFOdG2gNjKSPgXdw/yi3vpT/Y9XPKvNa2HYHNqvDlPn5lvd0iO4a0PXg== X-Received: by 2002:a92:a1c9:: with SMTP id b70mr4474185ill.198.1592583391559; Fri, 19 Jun 2020 09:16:31 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id r17sm3396032ilc.33.2020.06.19.09.16.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:16:30 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 07/57][B] Annotate hardware config module parameters in arch/x86/mm/ Date: Fri, 19 Jun 2020 11:15:31 -0500 Message-Id: <20200619161621.644540-8-seth.forshee@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619161621.644540-1-seth.forshee@canonical.com> References: <20200619161621.644540-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 arch/x86/mm/. [Note: With respect to testmmiotrace, an additional patch will be added separately that makes the module refuse to load if the kernel is locked down.] Suggested-by: Alan Cox Signed-off-by: David Howells Acked-by: Steven Rostedt cc: Ingo Molnar cc: Thomas Gleixner cc: "H. Peter Anvin" cc: x86@kernel.org cc: linux-kernel@vger.kernel.org cc: nouveau@lists.freedesktop.org (cherry picked from commit 3c2e2e6816930e25c755f2e4fc298a0d05d223cf) Signed-off-by: Seth Forshee --- arch/x86/mm/testmmiotrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c index dd2a4ce7b541..a9b62c9c1a8f 100644 --- a/arch/x86/mm/testmmiotrace.c +++ b/arch/x86/mm/testmmiotrace.c @@ -9,7 +9,7 @@ #include static unsigned long mmio_address; -module_param(mmio_address, ulong, 0); +module_param_hw(mmio_address, ulong, iomem, 0); MODULE_PARM_DESC(mmio_address, " Start address of the mapping of 16 kB " "(or 8 MB if read_far is non-zero).");