Message ID | 20200619161621.644540-4-seth.forshee@canonical.com |
---|---|
State | New |
Headers | show
Return-Path: <kernel-team-bounces@lists.ubuntu.com> 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=<UNKNOWN>) 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 49pP7p1Mg9zB47Q; Sat, 20 Jun 2020 02:16:38 +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 <kernel-team-bounces@lists.ubuntu.com>) id 1jmJgv-00029Q-Tl; Fri, 19 Jun 2020 16:16:33 +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 <seth.forshee@canonical.com>) id 1jmJgq-00025X-Dz for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:16:28 +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 <seth.forshee@canonical.com>) id 1jmJgq-0003ZL-1V for kernel-team@lists.ubuntu.com; Fri, 19 Jun 2020 16:16:28 +0000 Received: by mail-il1-f197.google.com with SMTP id e5so6791904ill.10 for <kernel-team@lists.ubuntu.com>; Fri, 19 Jun 2020 09:16:27 -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=AiOPnvOwqnyUNLD7jFJAgnOTqSxAvEOwg9Op5kONhfo=; b=UwHwo9AnZdP3vwoy/NU+haiP/qyYWad2k7GQxmoxkz2CWrjaePayZQGPqoaBLvA5sT YfFyCPqDGLlBIaA4p2IFKPOw40fWuCw2roMZ+x4OcIyMaGLN6YlydrmeRlIvDS+2/cPX 6YF8Ydu00ebcTpTXlgBQHcFtfD47cE8gBdMuWS4rDjaKEjW467lzlKJBSMLzHYhdtngb uuVBzr+NOCNzUMFKkW+3bxr9Yc1PNdHqf6lR1A7/fDpqWe90s2b7KFxr7OpiWaIqhLxu 56hg7F7WuuAin4t3IpKWYlZp7iu+9MWgsU+y2uqf9y42OasRIykWlKz3E5H63+XjBx1W o7wA== X-Gm-Message-State: AOAM531VXILUVJhDDf3aJAT+jGWVNAjt3dOU01icIlvSMcTwGB+Nx8Aw 8mnzfmfA3wRCEr9Jch8JimvEGNqIHCRwzYlnG+cM1HTCMgrn+DmdSQ+gHmhFdE3Or2rwpdNiesz lzCXH+m5xeCkRoG2v9mY06t7WPx9kVvsSzD+ooP4Evg== X-Received: by 2002:a92:c904:: with SMTP id t4mr4106036ilp.95.1592583386898; Fri, 19 Jun 2020 09:16:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0IA3BDXWOO72tgWiKZ88H2SyOU1GZPw41pMhSudD9daucCfOL/IJpsBmjpSBXD2JYLUIWxA== X-Received: by 2002:a92:c904:: with SMTP id t4mr4106016ilp.95.1592583386660; Fri, 19 Jun 2020 09:16:26 -0700 (PDT) Received: from localhost ([2605:a601:ac0f:820:f090:1573:c2fc:6389]) by smtp.gmail.com with ESMTPSA id t24sm65972ili.17.2020.06.19.09.16.25 for <kernel-team@lists.ubuntu.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 09:16:26 -0700 (PDT) From: Seth Forshee <seth.forshee@canonical.com> To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 03/57][B] Revert "Restrict /dev/mem and /dev/kmem when module loading is restricted" Date: Fri, 19 Jun 2020 11:15:27 -0500 Message-Id: <20200619161621.644540-4-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 <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" <kernel-team-bounces@lists.ubuntu.com> |
Series |
Lockdown updates
|
expand
|
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index a59fe7264c39..76997a645da8 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -188,9 +188,6 @@ static ssize_t write_mem(struct file *file, const char __user *buf, if (p != *ppos) return -EFBIG; - if (secure_modules()) - return -EPERM; - if (!valid_phys_addr_range(p, count)) return -EFAULT; @@ -558,9 +555,6 @@ static ssize_t write_kmem(struct file *file, const char __user *buf, char *kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ int err = 0; - if (secure_modules()) - return -EPERM; - if (p < (unsigned long) high_memory) { unsigned long to_write = min_t(unsigned long, count, (unsigned long)high_memory - p);
BugLink: https://bugs.launchpad.net/bugs/1884159 This reverts commit 517d6c3a5c1454115dd705e084a88818df3ad7e2 to backport an updated version. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> --- drivers/char/mem.c | 6 ------ 1 file changed, 6 deletions(-)