From patchwork Fri Jun 19 16:49:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1313179 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 49pPws3Kdyz9sVW; Sat, 20 Jun 2020 02:52:13 +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 1jmKFL-00081J-02; Fri, 19 Jun 2020 16:52:07 +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 1jmKEC-0007CR-2I for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:50:56 +0000 Received: from mail-io1-f70.google.com ([209.85.166.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmKEA-0006Nj-E0 for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:50:54 +0000 Received: by mail-io1-f70.google.com with SMTP id c17so7205509ioi.10 for ; Fri, 19 Jun 2020 09:50:54 -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=7XKBQb+yfv062gRlFUoiVKu33DCw4bYaAKJygfCXe78=; b=Jq3tQxPniLCjJN4NJ7/2jvO3k5wszeKhCiYpxTiEsIFJyo2/kTFPZpUKjQmGePIqlu 8oTTF+jOn62qZ1gIzHY6TrBpYOCrOzTGaWJKHuOZuanErE/5QZ/y0uO5o8GWOvQJrMmS 4z4HQumBvCTb9fQ5Z2ItbRialUC1rqk7n+9YHUWk5fRVrTfMABWoExU2JsnnsQGXX0vJ 6xOX9NlKG7UeLftcN8MeW7u3tdBJXIEZVUFdGp+lbceSK9Qge6nlH/LJ4E62vXkK+pC5 U5dFxZiltqm4DssrYihEvXpOYxPG4e9LgbflKAI800N2TfVpeF3j5/2dxrCYOJFq/v9X ULGg== X-Gm-Message-State: AOAM531fPdUxwFIaCMLbfSyvDXD8Lb3fZrzB4Emhn1ax1Cj+Pswr0ERl gtQNEzEhfRSCcvrLQ3MJHy9oG03sG0i40/bl5VO1IBE43gyZow9pYMZRdbsa/AHfOTIRSi4iL+N 7g9Hc7HQx5JcvCmz3hVHgW1/RzRMUa23nxB45RL5czw== X-Received: by 2002:a05:6e02:eb0:: with SMTP id u16mr4711318ilj.81.1592585453171; Fri, 19 Jun 2020 09:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzamypZVIkVVm8OafNg4gNPwjdK1X+Ndxhv6bTArp0d+jZxIG8QPpsFS+cX3nLeI8Umq2QEOQ== X-Received: by 2002:a05:6e02:eb0:: with SMTP id u16mr4711299ilj.81.1592585452823; Fri, 19 Jun 2020 09:50:52 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id r19sm3685819ioj.12.2020.06.19.09.50.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:50:52 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 33/57][X] Annotate hardware config module parameters in drivers/staging/speakup/ Date: Fri, 19 Jun 2020 11:49:46 -0500 Message-Id: <20200619165010.645925-34-seth.forshee@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619165010.645925-1-seth.forshee@canonical.com> References: <20200619165010.645925-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/staging/speakup/. Suggested-by: Alan Cox Signed-off-by: David Howells Acked-by: Greg Kroah-Hartman cc: speakup@linux-speakup.org cc: devel@driverdev.osuosl.org (backported from commit dbf05cb05f61145069d01ca9c6a896159184af88) Signed-off-by: Seth Forshee --- drivers/staging/speakup/speakup_acntpc.c | 2 +- drivers/staging/speakup/speakup_dtlk.c | 2 +- drivers/staging/speakup/speakup_keypc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/speakup/speakup_acntpc.c b/drivers/staging/speakup/speakup_acntpc.c index f418893928ec..092e2ae8f3eb 100644 --- a/drivers/staging/speakup/speakup_acntpc.c +++ b/drivers/staging/speakup/speakup_acntpc.c @@ -312,7 +312,7 @@ static void accent_release(void) speakup_info.port_tts = 0; } -module_param_named(port, port_forced, int, S_IRUGO); +module_param_hw_named(port, port_forced, int, ioport, S_IRUGO); module_param_named(start, synth_acntpc.startup, short, S_IRUGO); MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing)."); diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c index 345efd3344b0..a888315b9e78 100644 --- a/drivers/staging/speakup/speakup_dtlk.c +++ b/drivers/staging/speakup/speakup_dtlk.c @@ -382,7 +382,7 @@ static void dtlk_release(void) speakup_info.port_tts = 0; } -module_param_named(port, port_forced, int, S_IRUGO); +module_param_hw_named(port, port_forced, int, ioport, S_IRUGO); module_param_named(start, synth_dtlk.startup, short, S_IRUGO); MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing)."); diff --git a/drivers/staging/speakup/speakup_keypc.c b/drivers/staging/speakup/speakup_keypc.c index 6ea027365664..55c0e733a7fa 100644 --- a/drivers/staging/speakup/speakup_keypc.c +++ b/drivers/staging/speakup/speakup_keypc.c @@ -313,7 +313,7 @@ static void keynote_release(void) synth_port = 0; } -module_param_named(port, port_forced, int, S_IRUGO); +module_param_hw_named(port, port_forced, int, ioport, S_IRUGO); module_param_named(start, synth_keypc.startup, short, S_IRUGO); MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");