linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Florent Revest <revest@chromium.org>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, catalin.marinas@arm.com,
	anshuman.khandual@arm.com, joey.gouly@arm.com, mhocko@suse.com,
	keescook@chromium.org, david@redhat.com, peterx@redhat.com,
	izbyshev@ispras.ru, broonie@kernel.org, szabolcs.nagy@arm.com,
	kpsingh@kernel.org, gthelen@google.com, toiwoton@gmail.com,
	Florent Revest <revest@chromium.org>,
	linux-stable@vger.kernel.org
Subject: [PATCH v3 3/5] mm: Make PR_MDWE_REFUSE_EXEC_GAIN an unsigned long
Date: Tue,  4 Jul 2023 17:36:27 +0200	[thread overview]
Message-ID: <20230704153630.1591122-4-revest@chromium.org> (raw)
In-Reply-To: <20230704153630.1591122-1-revest@chromium.org>

Defining a prctl flag as an int is a footgun because on a 64 bit machine
and with a variadic implementation of prctl (like in musl and glibc),
when used directly as a prctl argument, it can get casted to long with
garbage upper bits which would result in unexpected behaviors.

This patch changes the constant to an unsigned long to eliminate that
possibilities. This does not break UAPI.

Fixes: b507808ebce2 ("mm: implement memory-deny-write-execute as a prctl")
Cc: linux-stable@vger.kernel.org
Signed-off-by: Florent Revest <revest@chromium.org>
Suggested-by: Alexey Izbyshev <izbyshev@ispras.ru>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
 include/uapi/linux/prctl.h       | 2 +-
 tools/include/uapi/linux/prctl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h
index f23d9a16507f..6e9af6cbc950 100644
--- a/include/uapi/linux/prctl.h
+++ b/include/uapi/linux/prctl.h
@@ -283,7 +283,7 @@ struct prctl_mm_map {
 
 /* Memory deny write / execute */
 #define PR_SET_MDWE			65
-# define PR_MDWE_REFUSE_EXEC_GAIN	1
+# define PR_MDWE_REFUSE_EXEC_GAIN	(1UL << 0)
 
 #define PR_GET_MDWE			66
 
diff --git a/tools/include/uapi/linux/prctl.h b/tools/include/uapi/linux/prctl.h
index f23d9a16507f..6e9af6cbc950 100644
--- a/tools/include/uapi/linux/prctl.h
+++ b/tools/include/uapi/linux/prctl.h
@@ -283,7 +283,7 @@ struct prctl_mm_map {
 
 /* Memory deny write / execute */
 #define PR_SET_MDWE			65
-# define PR_MDWE_REFUSE_EXEC_GAIN	1
+# define PR_MDWE_REFUSE_EXEC_GAIN	(1UL << 0)
 
 #define PR_GET_MDWE			66
 
-- 
2.41.0.255.g8b1d071c50-goog



  parent reply	other threads:[~2023-07-04 15:37 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-04 15:36 [PATCH v3 0/5] MDWE without inheritance Florent Revest
2023-07-04 15:36 ` [PATCH v3 1/5] kselftest: vm: Fix tabs/spaces inconsistency in the mdwe test Florent Revest
2023-08-25 22:23   ` Kees Cook
2023-08-27 13:09   ` Catalin Marinas
2023-08-28 14:45     ` Florent Revest
2023-07-04 15:36 ` [PATCH v3 2/5] kselftest: vm: Fix mdwe's mmap_FIXED test case Florent Revest
2023-07-13  7:13   ` Ryan Roberts
2023-08-25  4:37   ` Jain, Ayush
2023-08-25 22:28   ` Kees Cook
2023-08-28 14:46     ` Florent Revest
2023-08-27 13:09   ` Catalin Marinas
2023-07-04 15:36 ` Florent Revest [this message]
2023-07-04 15:45   ` [PATCH v3 3/5] mm: Make PR_MDWE_REFUSE_EXEC_GAIN an unsigned long Florent Revest
2023-08-25 22:29   ` Kees Cook
2023-07-04 15:36 ` [PATCH v3 4/5] mm: Add a NO_INHERIT flag to the PR_SET_MDWE prctl Florent Revest
2023-08-25 22:38   ` Kees Cook
2023-08-27 13:09     ` Catalin Marinas
2023-08-28 14:46       ` Florent Revest
2023-08-27 13:10   ` Catalin Marinas
2023-08-28 14:46     ` Florent Revest
2023-07-04 15:36 ` [PATCH v3 5/5] kselftest: vm: Add tests for no-inherit memory-deny-write-execute Florent Revest
2023-08-25 22:45   ` Kees Cook
2023-08-28 14:47     ` Florent Revest
2023-08-27 13:11   ` Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230704153630.1591122-4-revest@chromium.org \
    --to=revest@chromium.org \
    --cc=akpm@linux-foundation.org \
    --cc=anshuman.khandual@arm.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=david@redhat.com \
    --cc=gthelen@google.com \
    --cc=izbyshev@ispras.ru \
    --cc=joey.gouly@arm.com \
    --cc=keescook@chromium.org \
    --cc=kpsingh@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-stable@vger.kernel.org \
    --cc=mhocko@suse.com \
    --cc=peterx@redhat.com \
    --cc=szabolcs.nagy@arm.com \
    --cc=toiwoton@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox