From patchwork Fri Jun 19 16:15:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1313092 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 49pP9X739pzB47Q; Sat, 20 Jun 2020 02:18:08 +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 1jmJiM-0003In-TP; Fri, 19 Jun 2020 16:18:02 +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 1jmJhQ-0002YX-VC for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:17:05 +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 1jmJhP-0003fb-1b for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:17:03 +0000 Received: by mail-io1-f70.google.com with SMTP id m11so7134182ioj.14 for ; Fri, 19 Jun 2020 09:17:02 -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=6evih9eCw13bV+iTJ06y8E92Jy57NygmKyZJ5ZxTcb4=; b=C+vaLVVJDeRALTpLUgeXJPDysd/dl94cHQ0pRZv95El2wD98cK4Le2I6UDQeX8XXUq 13rEzkhvsl/YR3WNs8D3eOI55YcByIKlWrmelC6YVUlfGoMX27AY1qjort+k7EYAYHGG Blr2fIOIkW05z61Il2J0cTsXSOrXhSzHqzvxRlmG3zWIn9HD1hIRSpRKJKFYlNcedaes XcabNwFb0TOspGT5lmcKVlvLY5eUjkii8dkYt4tK4nZwGAIO4HpjXg2tOsURLhVDuCk2 Zpa6P35rEFUSXd05EFCnbAxGFsKmG2fhPea/0Ohb61eRqeOzz/GGZEepZOFNRynqcHVK 813Q== X-Gm-Message-State: AOAM5308FIRAzcHYW1p28MdZn/AduLaD56PKUqb0VoZ3JDyff4MsZ63D QCq3r1mQ13eYvAjCOtfRwtosZem64Tjj1k7pg+Iue1nFSpKnVTQdF64gJIw85NTCT9GIIq+o0K+ qKcgczlcgwYgCVeVlzP0k3uPBFeRTEAe59JGVKcKhPw== X-Received: by 2002:a6b:661a:: with SMTP id a26mr5079851ioc.197.1592583421910; Fri, 19 Jun 2020 09:17:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYzXDBgFOufj3YALuq1UyAaiv/itSvxUntDqPT7yGoAys9xBbqhV39haeLH4aoIc5QSyF5Vg== X-Received: by 2002:a6b:661a:: with SMTP id a26mr5079823ioc.197.1592583421641; Fri, 19 Jun 2020 09:17:01 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id p10sm3289588ilm.32.2020.06.19.09.17.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:17:00 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 31/57][B] Annotate hardware config module parameters in drivers/scsi/ Date: Fri, 19 Jun 2020 11:15:55 -0500 Message-Id: <20200619161621.644540-32-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/scsi/. Suggested-by: Alan Cox Signed-off-by: David Howells cc: "Juergen E. Fischer" cc: "James E.J. Bottomley" cc: "Martin K. Petersen" cc: Dario Ballabio cc: Finn Thain cc: Michael Schmitz cc: Achim Leubner cc: linux-scsi@vger.kernel.org (backported from commit 88f06b76e462119cb694c3ff13d7d343c49d2569) Signed-off-by: Seth Forshee --- drivers/scsi/aha152x.c | 4 ++-- drivers/scsi/aha1542.c | 2 +- drivers/scsi/g_NCR5380.c | 17 +++++++++++++++-- drivers/scsi/gdth.c | 2 +- drivers/scsi/qlogicfas.c | 4 ++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index f44d0487236e..ce5dc73d85bb 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c @@ -331,11 +331,11 @@ MODULE_LICENSE("GPL"); #if !defined(PCMCIA) #if defined(MODULE) static int io[] = {0, 0}; -module_param_array(io, int, NULL, 0); +module_param_hw_array(io, int, ioport, NULL, 0); MODULE_PARM_DESC(io,"base io address of controller"); static int irq[] = {0, 0}; -module_param_array(irq, int, NULL, 0); +module_param_hw_array(irq, int, irq, NULL, 0); MODULE_PARM_DESC(irq,"interrupt for controller"); static int scsiid[] = {7, 7}; diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index 5b8b2937a3fe..04e40ea98dad 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c @@ -31,7 +31,7 @@ module_param(isapnp, bool, 0); MODULE_PARM_DESC(isapnp, "enable PnP support (default=1)"); static int io[MAXBOARDS] = { 0x330, 0x334, 0, 0 }; -module_param_array(io, int, NULL, 0); +module_param_hw_array(io, int, ioport, NULL, 0); MODULE_PARM_DESC(io, "base IO address of controller (0x130,0x134,0x230,0x234,0x330,0x334, default=0x330,0x334)"); /* time AHA spends on the AT-bus during data transfer */ diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c index 87e081f8a386..70f83281bcf9 100644 --- a/drivers/scsi/g_NCR5380.c +++ b/drivers/scsi/g_NCR5380.c @@ -75,6 +75,7 @@ #include #include "g_NCR5380.h" #include "NCR5380.h" +#include #include #include #include @@ -174,6 +175,9 @@ static int __init do_NCR5380_setup(char *str) { int ints[10]; + if (secure_modules()) + return -EPERM; + get_options(str, ARRAY_SIZE(ints), ints); internal_setup(BOARD_NCR5380, str, ints); return 1; @@ -192,6 +196,9 @@ static int __init do_NCR53C400_setup(char *str) { int ints[10]; + if (secure_modules()) + return -EPERM; + get_options(str, ARRAY_SIZE(ints), ints); internal_setup(BOARD_NCR53C400, str, ints); return 1; @@ -210,6 +217,9 @@ static int __init do_NCR53C400A_setup(char *str) { int ints[10]; + if (secure_modules()) + return -EPERM; + get_options(str, ARRAY_SIZE(ints), ints); internal_setup(BOARD_NCR53C400A, str, ints); return 1; @@ -228,6 +238,9 @@ static int __init do_DTC3181E_setup(char *str) { int ints[10]; + if (secure_modules()) + return -EPERM; + get_options(str, ARRAY_SIZE(ints), ints); internal_setup(BOARD_DTC3181E, str, ints); return 1; @@ -717,9 +730,9 @@ static struct scsi_host_template driver_template = { #include #include "scsi_module.c" -module_param(ncr_irq, int, 0); +module_param_hw(ncr_irq, int, irq, 0); module_param(ncr_dma, int, 0); -module_param(ncr_addr, int, 0); +module_param_hw(ncr_addr, int, ioport, 0); module_param(ncr_5380, int, 0); module_param(ncr_53c400, int, 0); module_param(ncr_53c400a, int, 0); diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index 71e138044379..efc2083a211f 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -353,7 +353,7 @@ static int probe_eisa_isa = 0; static int force_dma32 = 0; /* parameters for modprobe/insmod */ -module_param_array(irq, int, NULL, 0); +module_param_hw_array(irq, int, irq, NULL, 0); module_param(disable, int, 0); module_param(reserve_mode, int, 0); module_param_array(reserve_list, int, NULL, 0); diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c index 61cac87fb86f..840823b99e51 100644 --- a/drivers/scsi/qlogicfas.c +++ b/drivers/scsi/qlogicfas.c @@ -137,8 +137,8 @@ err: static struct qlogicfas408_priv *cards; static int iobase[MAX_QLOGICFAS]; static int irq[MAX_QLOGICFAS] = { [0 ... MAX_QLOGICFAS-1] = -1 }; -module_param_array(iobase, int, NULL, 0); -module_param_array(irq, int, NULL, 0); +module_param_hw_array(iobase, int, ioport, NULL, 0); +module_param_hw_array(irq, int, irq, NULL, 0); MODULE_PARM_DESC(iobase, "I/O address"); MODULE_PARM_DESC(irq, "IRQ");