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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38EB4C83F15 for ; Mon, 28 Aug 2023 15:09:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 207E58E0024; Mon, 28 Aug 2023 11:09:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 13FED8E001A; Mon, 28 Aug 2023 11:09:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFAE98E0024; Mon, 28 Aug 2023 11:09:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DD2548E001A for ; Mon, 28 Aug 2023 11:09:15 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B42881202E5 for ; Mon, 28 Aug 2023 15:09:15 +0000 (UTC) X-FDA: 81173846670.22.5B91D97 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by imf02.hostedemail.com (Postfix) with ESMTP id 9E88680019 for ; Mon, 28 Aug 2023 15:09:13 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=WtQfO4zg; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf02.hostedemail.com: domain of revest@chromium.org designates 209.85.128.53 as permitted sender) smtp.mailfrom=revest@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693235353; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=9C6695DueeDZA9rTKrXkRn2f/fH50YffF9JA6g5ta/Y=; b=nDL3l2DpWKF0TQBtV+VgG3ZoyWe2jVnYH9Zh7aGtGH0J6+i/dvgLtlrtbvWs9dk9bD+m3R yNHNMUhcBqUtxgiYA7yHEqKfy4rVsDBc63EU/xc49neZQBltibUps+AHN0102yfl4RZyKX lwjcTGkq0sv7OX5oS9H/X8sXf1HSs6k= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=WtQfO4zg; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf02.hostedemail.com: domain of revest@chromium.org designates 209.85.128.53 as permitted sender) smtp.mailfrom=revest@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693235353; a=rsa-sha256; cv=none; b=iThTOFscXaHqxtBpfFKUUQCTusJceq9xanzN/dscPUZOP2eQP5InfjlTHX9sDmYEzfLBZo qWCBrGwTOhLC2JGG3JXoFGgo7W184vkXufKYoWY+N9MHVTU/pTpLp/Db0xjsRzYXGIw8Vb E+n4VaWiYarX5KQH5yBYFBWe878iEzA= Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-401c90ed2ecso11593255e9.0 for ; Mon, 28 Aug 2023 08:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1693235352; x=1693840152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9C6695DueeDZA9rTKrXkRn2f/fH50YffF9JA6g5ta/Y=; b=WtQfO4zgxksMpW7OaaxuZIAENI54VG0EzFAggndg9mUcIb3M2Xezcabx2+YryWgbAA N9iFiJ9bLirdEgKUNaxjDRF5W2tAbI2K3Rno8gaX6aJemzBypmY5oCw4hU97bDhNBdbn Rp2FXqPaLlJyPRfxE/Y4ar83+m9lXRdXQxNQU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693235352; x=1693840152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9C6695DueeDZA9rTKrXkRn2f/fH50YffF9JA6g5ta/Y=; b=jAwT1C6OeyoY+hq2ckT7bN+7o5gddvk8O9wQ0jHvMdk3aKHoEmFBsig2GfVwvbFBdW xwh/yj/1MOYrzH276BxD/wGR/x4W07Mz1fyceirVkUnUyA4yMOwHlby7pJQ7juI0i06i JRVkYTJV6S6V+w4XkSkgzEZcWxt21bEqgc2ThWCmfFile9PLxaTiVAnbnwemel/Ic5EB qDT6o4OrVfiWBcb15i/rdZMfv3B1BWnmT1QB+cX+DU1Q7QTFhscevdLCx9SJKVR9ferR xFsT2PzFjgDWeZQ3RWSU8qlMLWWqMjuUz2hoouhbf/CZfHC2W8wLG4w2gpKjJ1nYJ5th yL3w== X-Gm-Message-State: AOJu0Yw0gccoaJp7UTym6Om31Dai6PjeMOgIRL9nr5f80awwE2A0CqKH TELw3l4eT4AwGfugwgwDppBRHA== X-Google-Smtp-Source: AGHT+IEXUnMXPaBwdEFmcdrUudhk8uAYHPBV2ErTGdS4NlCyRahLQ06reLojtBElYN3aftIEBravdQ== X-Received: by 2002:a7b:cb49:0:b0:3fb:a506:5656 with SMTP id v9-20020a7bcb49000000b003fba5065656mr20934266wmj.32.1693235352415; Mon, 28 Aug 2023 08:09:12 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:40c6:6cff:63b:c70a]) by smtp.gmail.com with ESMTPSA id v3-20020a5d43c3000000b003140fff4f75sm10730522wrr.17.2023.08.28.08.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Aug 2023 08:09:11 -0700 (PDT) From: Florent Revest 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, ayush.jain3@amd.com, Florent Revest , stable@vger.kernel.org Subject: [PATCH v4 4/6] mm: Make PR_MDWE_REFUSE_EXEC_GAIN an unsigned long Date: Mon, 28 Aug 2023 17:08:56 +0200 Message-ID: <20230828150858.393570-5-revest@chromium.org> X-Mailer: git-send-email 2.42.0.rc2.253.gd59a3bf2b4-goog In-Reply-To: <20230828150858.393570-1-revest@chromium.org> References: <20230828150858.393570-1-revest@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9E88680019 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 4r9nmtgus6cokpgchf39mri6b6qjapgc X-HE-Tag: 1693235353-220418 X-HE-Meta: U2FsdGVkX19rSNbZhyHU31JdCW9x8igapGNNxrDl+Bl3XIfo1/4SGG1OGRFXJaLFGtG505/XfFpI7tS2+Bti/ayxmHhyDN1yFvq71JdhHrLPHp1MVlocSlTRabCXsaric4fvlZoGEi5pszK6lJl/v8WO3cOSMlA+9kVMlYsZSMoqhPP0MueQTmQMFahzVuZMKxa8S6jDxkAaL93TjNccdfLbp+Ry87tD9AnP6TQ0NatzkPGBmvDD4kn+HDZKElYbbsNYDn9XKo7Out1zTvo0m67D79hLWQ3wzAXHK/qcNk+ZA1tt6GPjAcqXsATfR+IE/VBRec4EnQoJewHvB5d0PM19oBkGXLaKdpl4H2l6I0riV2vdpeJxRSlm5QlV4POEU36ZIm5fWH0dhPqWHgjHUERzM2N1vdvPija7aBteNLDKITedO0TGH4u8Gox84pB6fIEcJOEK2ZxawHn+tLEqg9YsuvFrxet1RYd1LURiywkj7Vx5Sw87d3PijO8SXikN/wLEw701SD9bbSlz62m3xaSZcqRFjQDiZwF5JlqokuOcVPckROU81IlFPM8FajYs4l6DY8OvZn+TNUZFMGBQWqWjyPWsML5Kyre9VA0d9p6ZyaozEMtzO0m5atxnWfS6p45uE8ngqGPHAjB5AG9zCMh1uZm4OdnjfSwOR7YF2KRFY2aPStAjtEkZBBiuZiutvj/L2UFWmnWn7zSPkHWUV1S9s4h9FfkwI7OwHOt9EobjKNfLgBkYukoAmXdZnXIT8fa54u+JkBlJ+OOV64HUx9uwowNpB7wHA0goajp2Rd7ir7O7sBRqHSvtUFeJ7WUvHrzqLm55IyvhvvL7LqFDUtFWHFvoLjywBeAfFMYwomT2FCaNJsJcxil67wKC7rlNShhEVuKAScNOG4Hx0jm0zKWw7RNyMY6QK0+u7Zk4p4DaTpkC8+aARkYd54sGNshix4RjDfAWNbO/gLJO4iN 6xEoeH/r QN0dXV3I+mC6080pp2lkSaY/GGG+5D2fHXIx6kRLLUaHC/vMVSXntoB53mXjmU9xYwYhoI0b4TKTvqkrjmaHf+0Ky9esoSjq6/i1bx7sG+8kFswVBt98NX5BVjwtsRZ9SNcSaNvkfckma3LgBZ25NqPMM20nVXmP7gsWrKjJIKihMImm4GzohCAxKq1oia3/O9Fl3MSaS1ozweUbmDVn7igCKFdKrQqK8wVq8sNIuZk5ZnUTD23cYFjfy3kEZUe03uG/+qagtwyhILV7//vmJJe/4ElnMJh/u9YqccIeGuZAeTnX6NPSvcaViro5Sm4pcsHSEvaam4/nIacISgZz+vJV2+uCR9TUM++oJfrIURqkgBTqIwZOPgnSbQrmgz6nfHowk313uQVQW9ilzGkeardgjrtvMksiKVAV7QYKyzN394+UNhcgnFFXGWNoR6jhgPBoXfjSEwgf50n63wxfPA5jxKSP2RydcshjpmPPZOR00T4p7KVTmY8XJhdiimnh+nUv2nTE4UDTJVXdHy3RzLZrPcSdBLMpPEhePiNXuCXWQjQO895ryM4tXO7jR5IrdydEld9zhNpZ7N9ivOIweUNEMSfANfeRkUYyRDgfpJ7e7kMuQ5f/Qc4uyxXUrBe1plqfmUqxP48/2nlrjZM+p3SwScg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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: stable@vger.kernel.org Signed-off-by: Florent Revest Suggested-by: Alexey Izbyshev Reviewed-by: David Hildenbrand Reviewed-by: Kees Cook Acked-by: Catalin Marinas --- 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 3c36aeade991..9a85c69782bd 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 3c36aeade991..9a85c69782bd 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.42.0.rc2.253.gd59a3bf2b4-goog