Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 19 Aug 2022 10:30:01 +0800
From:   Aaron Lu <aaron.lu@intel.com>
To:     <security@kernel.org>, lkml <linux-kernel@vger.kernel.org>
CC:     Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Andy Lutomirski <luto@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Michal Hocko <mhocko@suse.com>,
        Logan Gunthorpe <logang@deltatee.com>
Subject: [PATCH 1/1] x86/mm: Use proper mask when setting PUD mapping
Message-ID: <Yv71qbuHkSsLGhvJ@ziqianlu-desk1>
References: <Yv71VPSjyy26v/Xu@ziqianlu-desk1>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <Yv71VPSjyy26v/Xu@ziqianlu-desk1>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yXM31KJc/97bFqGpXscQQQXSqvCQDyzIrp3qBXwKIJHza/zqjS+QVr0TdlC5?=
 =?us-ascii?Q?G91EaTMSh7EZI2PqEeYDOl537jsdvzhN4xOOlnZxZjWlpOVINHIA92Lc/Vnx?=
 =?us-ascii?Q?eLIEDsys7UOya1P+HmNdqDtDDVBvGLfUiBJKX6hJguZ5+45PujQf8/a6KHxC?=
 =?us-ascii?Q?nx7EfHz5SbCcB2d0LDp1YaLX89G5yl6Myavj8O9CSynldOLAmAVHDF5np2mX?=
 =?us-ascii?Q?yQkrJC7RhPSVC0vJjGomYVYTs79E0cMErK2qnWvofsM7/KtyF9B7rGvk1EMu?=
 =?us-ascii?Q?m2iMUdb3wR7J4FI+6Duz3UhWTIJr46kmf4Vgfp/gAqHoha4HKi+90oabp9c1?=
 =?us-ascii?Q?iIipf42Vs7CHo8MmwRuDJ53sAMjDOS0GjhWwCprXnjRd9nzGeYXslEEdtOwj?=
 =?us-ascii?Q?JgxFaYBF5hAN+BEffglARKxStMRPl1xQfUwKiGG+4gwD3Z+O+RFcEQlxow7G?=
 =?us-ascii?Q?9LmTP7gqnVK7j0lahYH2Li9ox9xZY5vFR7a3GzsQnKV5cUOkOmKBgcGEptIa?=
 =?us-ascii?Q?efDQseihjTGPAP8LP/zULSd9fZuSCmDj6NxbPS4cYeIXxVr4ROTu7g9FVMGU?=
 =?us-ascii?Q?KSr2XKELup/UxX1iXXNCxpeGgCsE5e7m42ub6Wmd2fGVGWJ8n9ecSFvYv8Xd?=
 =?us-ascii?Q?P8O90w0mIlV0nqD6yj1O71dFo5B4AvFW9tXyqNiQy+ZC9gmrXx56Evw7Rz4t?=
 =?us-ascii?Q?9D1jNaFRbjNCeeA05CP3gybAbzK2oCaYhwIZD9FXY7c8sBRjIbNmnhTod25W?=
 =?us-ascii?Q?uwm4sVNlEeaNYOt3Dl4JWteeYdr4pva5PAj2mNGoi9o3CluzFoS27gEjcG7w?=
 =?us-ascii?Q?yx7K89R8rPnt79BO3I+6uY9euJcNVRAKxNrNMfAuBf7841X1aT85cK8WwmR8?=
 =?us-ascii?Q?BmAi8ezk/jDI6/5+P1ZcprlUalSMvMqrfqm83kc1LhyYkPz3PBN7l2S3V2Y+?=
 =?us-ascii?Q?jm8P9xg2+OJoqTFvjAtQN57Aiim6BZ8p07eE4eYYEsCAsDca48q8hrNBJLeZ?=
 =?us-ascii?Q?UDj0JqKuqFrbfcjh05P34lmUmSty3LEUwncINZ1odwMSDKBUEW7DmfKdUNmM?=
 =?us-ascii?Q?mmnEoa/sEr9/yJ7kdYIK5MpdGJKA1fk6gqHlKBgVE8YTCizdp1ShFsaSYKJE?=
 =?us-ascii?Q?s+IpAGHhzZgUgAS1jM/CgOOMnnClYyNFehwhy73xDts/uOb8/wlfeBghUSln?=
 =?us-ascii?Q?mONLq0AzUz9qZP/fLCCHDAIxwmVpQ+zo0OipUZ+DQjlNBZI08xQaGCxwPB3S?=
 =?us-ascii?Q?9G4gDC1CXZ0EZleRUCZunahdzhcBiisUNgYlpGPFp/7OT4uWzDzWw4UBsjok?=
 =?us-ascii?Q?RprlfP9hIvLxROKxLD0t7t6FLN0LgQJ8bdhYPG5RL1LkV52oKSr/MeLwj3Rn?=
 =?us-ascii?Q?gEH7g7M1h0e7ZvKHK/tcaHzS8UVwRHZOelAdvLr7o0WuFLPIha/jh2pEaIiL?=
 =?us-ascii?Q?1skcD1zRYO9YSjnH6mYE9vT0AcHOzNnlHzvQnZHOJ1Z4N1aqLSN2GBT006/M?=
 =?us-ascii?Q?7s7mJW+WhCOypwIepXnu3UvPIZebYK4SQJe58wYr4S/WzXhQLqkDit14pmPz?=
 =?us-ascii?Q?ECQDUKx4DfUiam5HmmtrKPFp8YBsyevYsAJ9ha31?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 61c32b91-69b9-491e-a499-08da818abd40
X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3062.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2022 02:30:10.8040
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: A1zZodyrnBBx3Yp3KIT1YisKLZ/AnofZ4mIeg1fn0Y4MWxkEuO1PhEirMSzJ94zjJQiBB2I9JOATWjIlUMgjCg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2637
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

commit c164fbb40c43f("x86/mm: thread pgprot_t through
init_memory_mapping()") mistakenly used __pgprot() which doesn't
respect __default_kernel_pte_mask when setting PUD mapping, fix it
by using __pgprot_mask().

Fixes: c164fbb40c43f("x86/mm: thread pgprot_t through init_memory_mapping()")
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
---
 arch/x86/mm/init_64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 39c5246964a9..a7238f17df47 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -645,7 +645,7 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end,
 			pages++;
 			spin_lock(&init_mm.page_table_lock);
 
-			prot = __pgprot(pgprot_val(prot) | __PAGE_KERNEL_LARGE);
+			prot = __pgprot_mask(pgprot_val(prot) | __PAGE_KERNEL_LARGE);
 
 			set_pte_init((pte_t *)pud,
 				     pfn_pte((paddr & PUD_MASK) >> PAGE_SHIFT,
-- 
2.37.1