From patchwork Fri Jun 19 16:49:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1313180 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 49pPwx21MGzB4C8; Sat, 20 Jun 2020 02:52:17 +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 1jmKFO-00084C-J6; Fri, 19 Jun 2020 16:52:10 +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 1jmKEE-0007DD-7Z for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:50:58 +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 1jmKEB-0006Nx-GM for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:50:55 +0000 Received: by mail-io1-f70.google.com with SMTP id c17so7205545ioi.10 for ; Fri, 19 Jun 2020 09:50:55 -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=KPTYc9vIjdpsDkpkdtpldOj+A1+GdmiPIHbafAmh/Dc=; b=cTy5Gwr3Qwe5nsAMFF4SE5kBeSzNqVQSo2H4k7vGKGmlkJBSoj8fS/R86taFJB+Gsf ZNfPMjMjbxCAI1AtVHvOPIRD1BL53vtykqISt7L3gM2vp87V5LkS9XYVne2y/ABuB+as 9yFFG+JjJMXwsLLU84AVA0XQ8GaIOH1KseMo5341wQxPFvdM0/2ltv9dYSsustC7LBkJ TMVLs4WLB1+xQYEQna3fviuhpUNFiPckmiZsXYba3m2saK4mZ/mgyK1pQrsJz4YyD5tH FO4uxk7IqGjZdRfFIqO0KQPvryWHW3g2snAho0V+6elM6JaLOrGDaOe73oXXTrX0Y2Hy PxBw== X-Gm-Message-State: AOAM532B5ungxSDTNJ2byK2/hYeVhuVuqlIAqcBkmecqcKcMgBBytaL/ v43LNXwqmyb75XPq0wdypA8OtHHgIho1/aOl3HljSBT9MSLQIK/B6mxEBKhV6VUtYqlHFl/YLl4 3MAwt2f7jI0JyOg9LBeIbCd0FCoz6au5L2vrNydHCjw== X-Received: by 2002:a02:c802:: with SMTP id p2mr4674113jao.111.1592585454367; Fri, 19 Jun 2020 09:50:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOQFS8jFAyHlIZmheZyvbOLeGLgqC+sg4RTNb0GYc8SN3+Gl2qXe6m7cY4hRxcJWpSdKAyVw== X-Received: by 2002:a02:c802:: with SMTP id p2mr4674097jao.111.1592585454110; Fri, 19 Jun 2020 09:50:54 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id f22sm3665844iob.18.2020.06.19.09.50.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:50:53 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 34/57][X] Annotate hardware config module parameters in drivers/staging/vme/ Date: Fri, 19 Jun 2020 11:49:47 -0500 Message-Id: <20200619165010.645925-35-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/vme/. Suggested-by: Alan Cox Signed-off-by: David Howells cc: Martyn Welch cc: Manohar Vanga cc: Greg Kroah-Hartman cc: devel@driverdev.osuosl.org (backported from commit ea38fd72fb5f065e3f655d388193db3476820482) Signed-off-by: Seth Forshee --- drivers/staging/vme/devices/vme_pio2_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c index 35c6ce5047de..c7f068af3e58 100644 --- a/drivers/staging/vme/devices/vme_pio2_core.c +++ b/drivers/staging/vme/devices/vme_pio2_core.c @@ -478,16 +478,16 @@ static void __exit pio2_exit(void) /* These are required for each board */ MODULE_PARM_DESC(bus, "Enumeration of VMEbus to which the board is connected"); -module_param_array(bus, int, &bus_num, S_IRUGO); +module_param_hw_array(bus, int, other, &bus_num, S_IRUGO); MODULE_PARM_DESC(base, "Base VME address for PIO2 Registers"); -module_param_array(base, long, &base_num, S_IRUGO); +module_param_hw_array(base, long, other, &base_num, S_IRUGO); MODULE_PARM_DESC(vector, "VME IRQ Vector (Lower 4 bits masked)"); -module_param_array(vector, int, &vector_num, S_IRUGO); +module_param_hw_array(vector, int, other, &vector_num, S_IRUGO); MODULE_PARM_DESC(level, "VME IRQ Level"); -module_param_array(level, int, &level_num, S_IRUGO); +module_param_hw_array(level, int, other, &level_num, S_IRUGO); MODULE_PARM_DESC(variant, "Last 4 characters of PIO2 board variant"); module_param_array(variant, charp, &variant_num, S_IRUGO);