From patchwork Fri Jun 19 16:15:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1313095 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 49pP9m1ByqzB3tp; Sat, 20 Jun 2020 02:18:18 +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 1jmJiW-0003QR-Ca; Fri, 19 Jun 2020 16:18:12 +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 1jmJhS-0002a3-9f for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:17:06 +0000 Received: from mail-io1-f69.google.com ([209.85.166.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmJhQ-0003gW-HZ for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:17:04 +0000 Received: by mail-io1-f69.google.com with SMTP id g3so7148913ioc.20 for ; Fri, 19 Jun 2020 09:17:04 -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=VHL6SDuyGaUOiEerLfWtysP/5JzdyeTwqiohGCHg5Nc=; b=c1cGazph36QbzK1uWSpEDZyE9cS1p4Y7HitlMZHl+zah3MhqmgGxIL9tE9vPG4wuVe +BNGLE6zOQupSpLP0Pqmem9E2OtQT3lop+D7cAG/EyDOvQbhJ1CXbe4oNNYi9FqkcLK5 UuNYS2w/lzQ/6ItkZk4vE049ckVCVbt5nCNQgfLp6YRIEnK7sYwF4tL+XUSyGRLz9Mmj 1NQs6JZ1rL9xdCvBcdPrjaDjUn2hvV0bG/tno2grYqWrAk9EPydCWxkA3hWu1udFHbTK zHMfFx1DsoQizxJpTqo9jfDaspjuZvgSIfBTH5ybVK3ro8prbEi+K8LDdmjN13esbROb X8/Q== X-Gm-Message-State: AOAM532SIl8IRDJ6Eb5D06lzf6uRJ1Q+2Ze8hivsmiALWSUkw1+B6c2p oobK1t4O0oWU+y6ndMKievxgUgSpFOIwvqHo7Yh5dhDYcemZTpMN/pFx7Pj6quJ7MmRyXGACP9V XMGm4ULyidkS9Avr9vupWpt1b79IrL096lJcSmNwuVA== X-Received: by 2002:a92:6b05:: with SMTP id g5mr4204580ilc.120.1592583423299; Fri, 19 Jun 2020 09:17:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuwSpoiPWKMWwqiLm+BR9Qe+fsFSpZr/ulQyR++lG9S+1SUHo9G9b/zqbDDH3cAidCZkLq4Q== X-Received: by 2002:a92:6b05:: with SMTP id g5mr4204560ilc.120.1592583423051; Fri, 19 Jun 2020 09:17:03 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id n1sm3289624ilm.55.2020.06.19.09.17.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:17:02 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 32/57][B] Annotate hardware config module parameters in drivers/staging/media/ Date: Fri, 19 Jun 2020 11:15:56 -0500 Message-Id: <20200619161621.644540-33-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 drivers/staging/media/. Suggested-by: Alan Cox Signed-off-by: David Howells Acked-by: Greg Kroah-Hartman Acked-by: Mauro Carvalho Chehab cc: linux-media@vger.kernel.org cc: devel@driverdev.osuosl.org (cherry picked from commit 32820d8abd4d9502208697f0d26a3f8761b5868f) Signed-off-by: Seth Forshee --- drivers/staging/media/lirc/lirc_sir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c index 4f326e97ad75..e27842e01fba 100644 --- a/drivers/staging/media/lirc/lirc_sir.c +++ b/drivers/staging/media/lirc/lirc_sir.c @@ -986,10 +986,10 @@ MODULE_AUTHOR("Milan Pikula"); #endif MODULE_LICENSE("GPL"); -module_param(io, int, S_IRUGO); +module_param_hw(io, int, ioport, S_IRUGO); MODULE_PARM_DESC(io, "I/O address base (0x3f8 or 0x2f8)"); -module_param(irq, int, S_IRUGO); +module_param_hw(irq, int, irq, S_IRUGO); MODULE_PARM_DESC(irq, "Interrupt (4 or 3)"); module_param(threshold, int, S_IRUGO);