From patchwork Thu May 27 00:11:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 1484352 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=) 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 4Fr7Y04PCMz9sTD; Thu, 27 May 2021 10:12:03 +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 1lm3cz-0001px-9I; Thu, 27 May 2021 00:11:57 +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 1lm3cx-0001pq-Ld for kernel-team@lists.ubuntu.com; Thu, 27 May 2021 00:11:55 +0000 Received: from [177.198.111.192] (helo=mussarela..) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lm3cx-0002uV-0s for kernel-team@lists.ubuntu.com; Thu, 27 May 2021 00:11:55 +0000 From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [SRU Groovy,Focal/linux-oem-5.10/Hirsute 0/2] CVE-2021-3489 fixups Date: Wed, 26 May 2021 21:11:48 -0300 Message-Id: <20210527001150.38562-1-cascardo@canonical.com> X-Mailer: git-send-email 2.30.2 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" We ended up applying a version of the fix that had a bug that prevents the mapping from being mprotect(PROT_WRITE). We revert our version of the fix and apply the upstream version. This was tested against reproducers for the original issue. Also tested by doing mprotect(PROT_READ) followed with mprotect(PROT_WRITE), which fails without this change. It works fine with this patchset. Andrii Nakryiko (1): bpf: Prevent writable memory-mapping of read-only ringbuf pages Thadeu Lima de Souza Cascardo (1): UBUNTU: SAUCE: Revert "UBUNTU: SAUCE: bpf: prevent writable memory-mapping of read-only ringbuf pages" kernel/bpf/ringbuf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Acked-by: Tim Gardner Acked-by: Kleber Sacilotto de Souza