From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DA57C6FD1C for ; Thu, 23 Mar 2023 01:34:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230040AbjCWBeG (ORCPT ); Wed, 22 Mar 2023 21:34:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230226AbjCWBde (ORCPT ); Wed, 22 Mar 2023 21:33:34 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FFB1CA0B for ; Wed, 22 Mar 2023 18:33:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A7434B81EAC for ; Thu, 23 Mar 2023 01:32:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49136C433EF; Thu, 23 Mar 2023 01:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1679535133; bh=lfilP38sZMvKV3AL4tBJvfy3KAY2SP4ZHW9AeOLPqb0=; h=Date:To:From:Subject:From; b=JycCf04We15rBkLhH+DSgoD5h4HCONJAKfiwqvU7YrnzC+KqOlBRemVsuCzQD6L6J mcs5y1Xt+7q3d+CBItaPe9JrUJiwsPFMJyM9IRFXzPYdtBgoVcgbGWxr5UMh/mcl/Z vjkbug5wAKWE0hnTvKUq3H4K8fG5tZSbDqpKRD0g= Date: Wed, 22 Mar 2023 18:32:12 -0700 To: mm-commits@vger.kernel.org, shuah@kernel.org, peterx@redhat.com, nd@arm.com, keescook@chromium.org, izbyshev@ispras.ru, catalin.marinas@arm.com, acme@redhat.com, joey.gouly@arm.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-hotfixes-stable] mm-fix-error-handling-for-map_deny_write_exec.patch removed from -mm tree Message-Id: <20230323013213.49136C433EF@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm: fix error handling for map_deny_write_exec has been removed from the -mm tree. Its filename was mm-fix-error-handling-for-map_deny_write_exec.patch This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Joey Gouly Subject: mm: fix error handling for map_deny_write_exec Date: Wed, 8 Mar 2023 19:04:21 +0000 Commit 4a18419f71cd ("mm/mprotect: use mmu_gather") changed 'goto out;' to 'break' in the loop. This wasn't noticed while rebasing the MDWE patches, so fix it now. Link: https://lkml.kernel.org/r/20230308190423.46491-3-joey.gouly@arm.com Fixes: b507808ebce2 ("mm: implement memory-deny-write-execute as a prctl") Signed-off-by: Joey Gouly Reported-by: Alexey Izbyshev Link: https://lore.kernel.org/linux-arm-kernel/8408d8901e9d7ee6b78db4c6cba04b78@ispras.ru/ Reviewed-by: Catalin Marinas Cc: Arnaldo Carvalho de Melo Cc: Kees Cook Cc: nd Cc: Peter Xu Cc: Shuah Khan Signed-off-by: Andrew Morton --- --- a/mm/mprotect.c~mm-fix-error-handling-for-map_deny_write_exec +++ a/mm/mprotect.c @@ -805,7 +805,7 @@ static int do_mprotect_pkey(unsigned lon if (map_deny_write_exec(vma, newflags)) { error = -EACCES; - goto out; + break; } /* Allow architectures to sanity-check the new flags */ _ Patches currently in -mm which might be from joey.gouly@arm.com are