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 3FA72C4332F for ; Sat, 17 Dec 2022 00:11:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A2F478E0003; Fri, 16 Dec 2022 19:11:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9DE208E0001; Fri, 16 Dec 2022 19:11:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CE0A8E0003; Fri, 16 Dec 2022 19:11:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 79B1B8E0001 for ; Fri, 16 Dec 2022 19:11:31 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4FB161A1284 for ; Sat, 17 Dec 2022 00:11:31 +0000 (UTC) X-FDA: 80249869182.02.C15E523 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id D28DD100007 for ; Sat, 17 Dec 2022 00:11:29 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jF6BnzUi; spf=pass (imf14.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671235889; 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:references:dkim-signature; bh=3nFI02VHAoJarbgsr9p4Iwhh8+HfLvo58FakLElS+PA=; b=ayxtGYhfEzzxJwvM7W9GFCgO0QGhYXkL7CdMVLJL0DCH0bnLSnGq4dHxLAeWEkRPVyudUf mKo8HFLOIYjnLszwcBpvz2e9ZU1fc+lFiz2m96/gk362kjoRYugAPg9I2a1gtK35n6QFWB ywjj3lD2wXhGXrXYbXrOh4tCd3BFxQQ= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=jF6BnzUi; spf=pass (imf14.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671235889; a=rsa-sha256; cv=none; b=kNiskEKSaqkQ6sNk50reAZMUhi3/mSH9dn/rxTK/pe4RFY6G+TXLPEPFPyzsDMq9J6qlz2 BG01RAImKmrHrDMXf9JoktIqcHmMeiaZLRidxvkCcAfKlFRBoAitf7e7j0LEyAELrcyCCL 0YUOqJjUJLrVgY3cXn5kyO48tA/9kKY= 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 dfw.source.kernel.org (Postfix) with ESMTPS id EFE5A622D6; Sat, 17 Dec 2022 00:11:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B2B6C433F2; Sat, 17 Dec 2022 00:11:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235888; bh=63SC94Ier2TFvKzC6i0Z1YJOo/PKtnMOWVRuPbn9sTA=; h=From:To:Cc:Subject:Date:From; b=jF6BnzUiwWst7eQbwJuBOwXzQNN9/M80/FvV8Rt3BAiK+zrVDCFIL74TU3aMXa4dQ 2dgUNlaz+dHdK5jAJ5yVAzHcVyb6yQPOh6ZcyHiHxHevc5oIpAmsa7V/lkKWxj1kxs vstkcQ2jAAsAnnOU/rdi25Z8OEqfkvsZ9rEMKUg4IrbmbnS5aLKtD2xqVV60BXJ08V 3gyV6IQDgDJAC1pM1bguPBTs+W37ceei9336/xXfWjPAqP9rpMz9bh+HMtO8figJ7o jhUhFPSEOjku3giDazkp+E7j32N68/UCh/bF7AROz3BE7LEi9yx7Lf+i+f1lTtlyEJ zW3ZaCBnSmgWg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Liu Shixin , Kees Cook , Sasha Levin , viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH AUTOSEL 4.14] binfmt_misc: fix shift-out-of-bounds in check_special_flags Date: Fri, 16 Dec 2022 19:11:25 -0500 Message-Id: <20221217001125.41560-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: D28DD100007 X-Rspam-User: X-Stat-Signature: y4nbon4abgrp5qgj81q1q5r6w4j7gf68 X-HE-Tag: 1671235889-914225 X-HE-Meta: U2FsdGVkX1+cFkYDyJkPqS+CZQ+z7ZxXqdCtJtxQ5pSvzH2YjqTyeX9gbuvnQdRTU0wG9TsCJvLkeSNCZJOOaNBgE1nie7mwknzhR/59THLAwxrkPHba5aRBkT76cdrksyJMr7fX05bvtMrOJi4OJ+0ZbfFWpVX02RJJfct72v4Oy5+Lg32OqgOuDGMhT+P4eDWsgkBH/FhYuZisz7J5ucw2bB+aUzwNbF3eMR6xSw++2NFII9r2YkP/wD0FXy/XDFtnBoxAb2MYdQVSZjnLWPpFYnPaUmPnuKrGa7FqBVKwRoeC5AsBwuvofoD8yDWcFK33u6l7kkvIqExccFXAO7g53LAX3u/sVA6CGuCG2DCCd8Of+5C+ZB5FtnJk25sKvaIUV3rhTUgnV8yOVXEFSNO++AHiUsD8+ELQPuTIzxAHp+JK6iDONJHuLFrt00TRi87f72tiwIWnMe5v1KHh0xiwiDgbxocobJgNrUXX74gHFWlFx4irjKYN8/yisv0ORpig+r8fq7K81GScYCOlu8HL1yxVlz8lGmsxzQQjl0Z+JUPui+Uy/+YAnE8uCLJrzgW+AyIybEQUGrP66VcTNfHuaIilDut7fVA8RLlx+hqxT0D7J7zUt4tTh6dy2Nh2tNaGIlYnPg7hdCX1FIz/5ZOUorZ8FZ6ZicEnzDFBX+i8ri5P7i1O6EgzOJp0G4uFCb//1mxQJGbKS0pDJ+HtN5fEyIi5qQH7kBTYHFpIWo8krWiz5gwJ+RjSeGm/fJEyt81Si1i7TUjeDDWgjT1WU+TJEpJkV6O98P+Fa2X9ZkisIL6uvkE/RgaYrTOuwGiyzO44hAxwECXyLYN/WGH0fNvURMTRCb1gjb/bEFEorKduf8jvVb2BBndEPeh0JDA+EAK3h9FSECTCLLknJrWqXjDvQGls9q4qmhBk7Oj52Sg1aWCz1OgYrEFE022oJyGA5FFAR7Buzz0jCnmlPjq f1rZ5t5q duRZuEkB+mCfh5XeSFH7NVKtgr5E+uqiyWDt2goeJxUT5oq5469eZSGZTeqFCIek+seCXBEjpS9OshFhKyP+gkgju8uIS4HPLVYaAoCbZfaOmuLXoMj0hAW4wRw== 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: From: Liu Shixin [ Upstream commit 6a46bf558803dd2b959ca7435a5c143efe837217 ] UBSAN reported a shift-out-of-bounds warning: left shift of 1 by 31 places cannot be represented in type 'int' Call Trace: __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x8d/0xcf lib/dump_stack.c:106 ubsan_epilogue+0xa/0x44 lib/ubsan.c:151 __ubsan_handle_shift_out_of_bounds+0x1e7/0x208 lib/ubsan.c:322 check_special_flags fs/binfmt_misc.c:241 [inline] create_entry fs/binfmt_misc.c:456 [inline] bm_register_write+0x9d3/0xa20 fs/binfmt_misc.c:654 vfs_write+0x11e/0x580 fs/read_write.c:582 ksys_write+0xcf/0x120 fs/read_write.c:637 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x34/0x80 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x4194e1 Since the type of Node's flags is unsigned long, we should define these macros with same type too. Signed-off-by: Liu Shixin Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20221102025123.1117184-1-liushixin2@huawei.com Signed-off-by: Sasha Levin --- fs/binfmt_misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 566296ce7ea8..c19bf5c2fbec 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -42,10 +42,10 @@ static LIST_HEAD(entries); static int enabled = 1; enum {Enabled, Magic}; -#define MISC_FMT_PRESERVE_ARGV0 (1 << 31) -#define MISC_FMT_OPEN_BINARY (1 << 30) -#define MISC_FMT_CREDENTIALS (1 << 29) -#define MISC_FMT_OPEN_FILE (1 << 28) +#define MISC_FMT_PRESERVE_ARGV0 (1UL << 31) +#define MISC_FMT_OPEN_BINARY (1UL << 30) +#define MISC_FMT_CREDENTIALS (1UL << 29) +#define MISC_FMT_OPEN_FILE (1UL << 28) typedef struct { struct list_head list; -- 2.35.1