From patchwork Thu Jun 18 23:12:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1312480 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 49nyTs11Rnz9sRW; Fri, 19 Jun 2020 09:15:45 +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 1jm3kx-00012H-1O; Thu, 18 Jun 2020 23:15:39 +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 1jm3jA-0008Qn-JW for kernel-team@lists.ubuntu.com; Thu, 18 Jun 2020 23:13:48 +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 1jm3j8-0008Sw-Ha for kernel-team@lists.ubuntu.com; Thu, 18 Jun 2020 23:13:46 +0000 Received: by mail-io1-f70.google.com with SMTP id w2so5338178iom.13 for ; Thu, 18 Jun 2020 16:13:46 -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=Wt4GEmkLeicCKkTRcKDOwOKEl/5hsKr/FR2QwF9CMsic1lJNRrmaqh3gM4Hv68nmV6 WFpnSmfdzLx9OIBLegNwPKp7CE+NYkzXCEXp8Drt5fvmW1+6iTNETyK7a8PuY1ArKEd3 JzuruiiOj1dOraCB9g8VJxEts0W5tcTyF3J5888RKGuCWz7qVLoBUYDvZRI8RBBlEe/y uL9pja7fcnfgNJLv/uI24SKcAUnTgih6U+MRFEsdiiwYUky7ADXL7HUmyQkALpKADIJ7 7HwXyX1oWjwC4VZm3li7k7aESGngPT1qyGcArw2TPJ174ba8iIVxfR+svqHzWoTxGKfo znag== X-Gm-Message-State: AOAM531nDM6BGHrsBkpwE6Up6Vor52ul0Dzl6CxMzQeycakmD7dWtmhR FqQ68qJgoQ8WWZloVWT6K+yTD7ZKwES5PQJ64FF364X0RAo5FpwRrJ4Sc25qNtvFsK2JjjR0QWj BhZe94cUZdnsETq3oDDNp5A+lu/M+GIRLCeQPelimFg== X-Received: by 2002:a5e:9908:: with SMTP id t8mr1193014ioj.171.1592522025336; Thu, 18 Jun 2020 16:13:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrBGNLBf2H9g9YHARa6mwI69lp+mQbpwMX7gvwnGrsBqz9G6Rbkl2frsj876ReQ14zytDzhg== X-Received: by 2002:a5e:9908:: with SMTP id t8mr1193002ioj.171.1592522025081; Thu, 18 Jun 2020 16:13:45 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id l9sm2095747ili.86.2020.06.18.16.13.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2020 16:13:44 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 33/47][X] Annotate hardware config module parameters in drivers/staging/speakup/ Date: Thu, 18 Jun 2020 18:12:44 -0500 Message-Id: <20200618231258.630575-34-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/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).");