From patchwork Thu Jun 18 23:12:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1312466 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 49nySK2pr0z9sR4; Fri, 19 Jun 2020 09:14:25 +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 1jm3jf-0000Mn-16; Thu, 18 Jun 2020 23:14:19 +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 1jm3it-0008E7-7K for kernel-team@lists.ubuntu.com; Thu, 18 Jun 2020 23:13:31 +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 1jm3ir-0008Qn-0g for kernel-team@lists.ubuntu.com; Thu, 18 Jun 2020 23:13:29 +0000 Received: by mail-il1-f197.google.com with SMTP id v14so5128328ilo.19 for ; Thu, 18 Jun 2020 16:13:28 -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=EAAy2jsyO/x+py6Ttd3XgcKs2zdMfVXyxg2ZwvdpDoU=; b=UK6fNJib1/F5Fl9eDg3H8X2mnf1MkxAmj6b+g8X0e7xVXOjhhi3X0AqEsc4rGFbItI 8oIC62T6rky1XEEc45RNWtOOz14aRzauXjPaeIa+MNTudzPpRXAhTWwOET9/IO4pTGTw sPo8KqsG6tUnR2NfoQyHXOcv7Z1fQvepZIyfZl/4dpa553XbQs4CBQWD3URsBkl/PMgd wQU8AnqAk8CIdxO1HebGxbTFlQSWBUvwNg5f4zcsox1Fl5q0EQd7VOu/7VaAEIuLOWSy Dz+YQIEursTAaVXy8IhdnOKjwhy1t2VjifZYGRGYIVUbPZrnlqVhEm6HHvxzZ1T/BcUE QIEA== X-Gm-Message-State: AOAM533dFtammSrGOXiWg41sS86XpbXzsfOogsCGIqlDfxuDi14AII6G /OdYKoxAxsYECvTh7A2+ACdSXICjn+KYUcdKAmxukbTMp3/UtJj8Ci9IfVEHWBTD3ehUUEyFfXM glFZv/Ddz82ZCqqcH6sFNlILBPSpT9vkvzbh2at4kyA== X-Received: by 2002:a92:35dd:: with SMTP id c90mr908632ilf.103.1592522007865; Thu, 18 Jun 2020 16:13:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8y+U3H8y8G59JHUG4rtkXE+V4JHHvP4jVYlIcAXPSxdOws2EyfwU2zIt7oYH5x/Qj8S993g== X-Received: by 2002:a92:35dd:: with SMTP id c90mr908619ilf.103.1592522007547; Thu, 18 Jun 2020 16:13:27 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id j63sm2379060ilg.50.2020.06.18.16.13.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2020 16:13:27 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 21/47][X] Annotate hardware config module parameters in drivers/net/arcnet/ Date: Thu, 18 Jun 2020 18:12:32 -0500 Message-Id: <20200618231258.630575-22-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/net/arcnet/. Suggested-by: Alan Cox Signed-off-by: David Howells cc: Michael Grzeschik cc: netdev@vger.kernel.org (cherry picked from commit 06a5128a29b3d67fadff5d9593d79b815d8b34d8) Signed-off-by: Seth Forshee --- drivers/net/arcnet/com20020-isa.c | 4 ++-- drivers/net/arcnet/com90io.c | 4 ++-- drivers/net/arcnet/com90xx.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c index b9e9931353b2..38fa60ddaf2e 100644 --- a/drivers/net/arcnet/com20020-isa.c +++ b/drivers/net/arcnet/com20020-isa.c @@ -129,8 +129,8 @@ static int clockp = 0; static int clockm = 0; module_param(node, int, 0); -module_param(io, int, 0); -module_param(irq, int, 0); +module_param_hw(io, int, ioport, 0); +module_param_hw(irq, int, irq, 0); module_param_string(device, device, sizeof(device), 0); module_param(timeout, int, 0); module_param(backplane, int, 0); diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c index b57863df5bf5..4e56aaf2b984 100644 --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c @@ -347,8 +347,8 @@ static int io; /* use the insmod io= irq= shmem= options */ static int irq; static char device[9]; /* use eg. device=arc1 to change name */ -module_param(io, int, 0); -module_param(irq, int, 0); +module_param_hw(io, int, ioport, 0); +module_param_hw(irq, int, irq, 0); module_param_string(device, device, sizeof(device), 0); MODULE_LICENSE("GPL"); diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c index 0d9b45ff1bb2..7cbdfca6d189 100644 --- a/drivers/net/arcnet/com90xx.c +++ b/drivers/net/arcnet/com90xx.c @@ -88,8 +88,8 @@ static int irq; static int shmem; static char device[9]; /* use eg. device=arc1 to change name */ -module_param(io, int, 0); -module_param(irq, int, 0); +module_param_hw(io, int, ioport, 0); +module_param_hw(irq, int, irq, 0); module_param(shmem, int, 0); module_param_string(device, device, sizeof(device), 0);