From patchwork Tue Oct 11 17:00:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1688733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Szrn5Goz; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mn28l1NTSz1yqk for ; Wed, 12 Oct 2022 04:00:23 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1oiIbz-0002Kv-OV; Tue, 11 Oct 2022 17:00:11 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1oiIby-0002Kn-7c for kernel-team@lists.ubuntu.com; Tue, 11 Oct 2022 17:00:10 +0000 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id B8CA43F147 for ; Tue, 11 Oct 2022 17:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1665507609; bh=TOQgfBqRsxP/NSvzVmq/ZtzPZoUQ2fkTsa20Q1EgikI=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Szrn5Gozsro2B3vQ4xLvqoMd4c+wAJRWqrw9LE58Costw5N79zRBNqDRLi7uYO9Mv mSeznT+OhF2GN6pXVXF+OLjc1M+RucL6T2UfCCTNEmbKbBUyxKNkCxGSOhHb/qRBW1 FmPaZlBXm2H597RN/OPLt2gC936XLts0w01SYlFA6wehAdm4yoIhqT8Ry/k6hpOl8v apBzv2uGREvz6gj+6ORxsIzZFzzHhLf1yqdasi0syWmnp43gUJlYvckrNiBszUj8d3 ZIngYAiqSul8VI2v8D90IN6OWrHs0AcFqx0Ny0oWeFYgEuoBNZgpPpfvr65ESVsEQp r/8gF/LUWrpVw== Received: by mail-wm1-f70.google.com with SMTP id h129-20020a1c2187000000b003bf635eac31so5687066wmh.4 for ; Tue, 11 Oct 2022 10:00:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TOQgfBqRsxP/NSvzVmq/ZtzPZoUQ2fkTsa20Q1EgikI=; b=KzPR3ercUJmsYrXQYwEB56/6WVSzjwCqlS9XzrxM7DpiIbqsbKYceFaKDCZVjSkomD 5PiRCxqFtMhd9ITWaODsL5I5sGorcSm4QX7sV1ZC3i7WOmmHJGTRBrpEkiZqQsUpMuX2 bVXugk5ve/CJbfG+JRwDqH6PrMDZzvXuKuGuGkTVnwcoo5GJDP/4gYqAwUa3IIjkCD4Y JLzrW/tw23+PefET+OSr2rCvi7WB56H0kmHHEUvA3uI88slHPGgujGRghgLZUjIDNOB4 VCwr0OXEzpaGeRvArq2rURR2/IeLX6TSDjct0iUwgh9icUpRQAKYneEjcevMtbEW1gaH ZEHQ== X-Gm-Message-State: ACrzQf3DcCsTElKysFFGk9aEC5c6+XCS76RnZjhFtf7anbRZXBbMHpR7 Q10NOf8YJtTCyeq7raVF+0bQYizKtISsN8fVZPaMQdgz5SkaJBQJy1JMvE1iWF7J3kKRlsmPIGd rKWelJFZZ6Po8OSzAryoGBUt8Jz4ZOlh2UpaOVutJrw== X-Received: by 2002:adf:fac7:0:b0:22e:4773:23a9 with SMTP id a7-20020adffac7000000b0022e477323a9mr15987640wrs.537.1665507609197; Tue, 11 Oct 2022 10:00:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4EpbeNiZ0ZdbAKmoZwrpOT3XBgTd7QfMiVLX/JC+GB+nL2BMKQ9wWvb+oJO1AHQcC3XiYdyg== X-Received: by 2002:adf:fac7:0:b0:22e:4773:23a9 with SMTP id a7-20020adffac7000000b0022e477323a9mr15987625wrs.537.1665507608967; Tue, 11 Oct 2022 10:00:08 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:2160:31b3:dfc8:afef]) by smtp.gmail.com with ESMTPSA id l17-20020a05600c1d1100b003a4efb794d7sm14091019wms.36.2022.10.11.10.00.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Oct 2022 10:00:08 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [KINETIC][PATCH] UBUNTU: SAUCE: Revert "riscv: mmap with PROT_WRITE but no PROT_READ is invalid" Date: Tue, 11 Oct 2022 18:00:05 +0100 Message-Id: <20221011170005.96692-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 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" This reverts commit 9795ca67b5d3eeeb4b602cbc34f72f41af6df142. Upstream reported riscv regression of userspace (OpenJDK). BugLink: https://bugs.launchpad.net/bugs/1992484 Signed-off-by: Dimitri John Ledkov Acked-by: Cory Todd Acked-by: Thadeu Lima de Souza Cascardo --- arch/riscv/kernel/sys_riscv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c index 571556bb92..9c0194f176 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c @@ -18,8 +18,9 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, if (unlikely(offset & (~PAGE_MASK >> page_shift_offset))) return -EINVAL; - if (unlikely((prot & PROT_WRITE) && !(prot & PROT_READ))) - return -EINVAL; + if ((prot & PROT_WRITE) && (prot & PROT_EXEC)) + if (unlikely(!(prot & PROT_READ))) + return -EINVAL; return ksys_mmap_pgoff(addr, len, prot, flags, fd, offset >> (PAGE_SHIFT - page_shift_offset));