From patchwork Fri Jun 19 16:15:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1313083 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 49pP8w5C2QzB3tk; Sat, 20 Jun 2020 02:17:36 +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 1jmJhs-0002vx-7H; Fri, 19 Jun 2020 16:17:32 +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 1jmJhA-0002Kv-EX for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:16:48 +0000 Received: from mail-il1-f197.google.com ([209.85.166.197]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jmJh8-0003b2-Qc for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:16:47 +0000 Received: by mail-il1-f197.google.com with SMTP id k63so6810338ilg.17 for ; Fri, 19 Jun 2020 09:16: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=oZjnHxKTRX1BIAALuvjimTbveYb60wqvLXYE53tpma0=; b=KVoacjxB0ubivZyOKNZEcHcHNxAg8JbPaQ1yn2OwGbk2FH9qCTCxMA79Ise7ZnbOWF TXWaVBzPq0YtNIxa2sqT8itVieNc2RtGPTx5+pzYPra4wRUJvUSEB0a+6XXpKlPDzUi4 RopG68sVuBGkfqvFK6Hmbwvv5N8lHDY6BMQguZcfm5gqMA0xYWAXE5mb/W9jd2Nu401X ZlnumUFEdSPxg+Qq5lZ2E53k/iB1/RxfHBIo0GJ7+RW4mYlmglldS4XUh+k8wHNeWRIR v+6n/cKgEwhVg9nIn9+buC70Kv6AMDxU+bzGj482PfWthuoYaSFeqY1oCJY9QYVBMssg QhKQ== X-Gm-Message-State: AOAM533mE4rlrJiwx3nOyjN70FmLTS4SK3vcxiiMqr0/OfIsQ0+dpQca +8AIarIgPcqM/MkfHZOIqhAHtdIRXEKn9uy3DWmGmLFr0lqjUWxlL1UzqGvGKoZVjLNn4ufdrnZ SsvEINHcWpePeSS3GQcv6J14iUK+Pbzx6dIanXMSK0w== X-Received: by 2002:a5d:9413:: with SMTP id v19mr5330415ion.105.1592583405683; Fri, 19 Jun 2020 09:16:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxm2zjJuoxpWaIgQttM7EVxMrFmM53RvnkeNBx3u89RPNB7u+10waf39VRPSBdDmazLeZSFSA== X-Received: by 2002:a5d:9413:: with SMTP id v19mr5330282ion.105.1592583404213; Fri, 19 Jun 2020 09:16:44 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id n7sm3320541ile.76.2020.06.19.09.16.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:16:43 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 17/57][B] Annotate hardware config module parameters in drivers/media/ Date: Fri, 19 Jun 2020 11:15:41 -0500 Message-Id: <20200619161621.644540-18-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/media/. Suggested-by: Alan Cox Signed-off-by: David Howells Acked-by: Mauro Carvalho Chehab cc: mjpeg-users@lists.sourceforge.net cc: linux-media@vger.kernel.org (backported from commit 5a8fc6a3cebb0dde27584603c5c4b5c72c6d810f) Signed-off-by: Seth Forshee --- drivers/media/pci/zoran/zoran_card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/pci/zoran/zoran_card.c b/drivers/media/pci/zoran/zoran_card.c index 1136d92af642..4dc81cca7cdb 100644 --- a/drivers/media/pci/zoran/zoran_card.c +++ b/drivers/media/pci/zoran/zoran_card.c @@ -73,7 +73,7 @@ MODULE_PARM_DESC(card, "Card type"); */ static unsigned long vidmem; /* default = 0 - Video memory base address */ -module_param(vidmem, ulong, 0444); +module_param_hw(vidmem, ulong, iomem, 0444); MODULE_PARM_DESC(vidmem, "Default video memory base address"); /*