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 61E59C3DA71 for ; Sat, 17 Dec 2022 00:11:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE9E48E0006; Fri, 16 Dec 2022 19:11:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E98E58E0001; Fri, 16 Dec 2022 19:11:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D3A1D8E0006; Fri, 16 Dec 2022 19:11:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BACC88E0001 for ; Fri, 16 Dec 2022 19:11:25 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6DC554126C for ; Sat, 17 Dec 2022 00:11:25 +0000 (UTC) X-FDA: 80249868930.27.F1DDABC Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf11.hostedemail.com (Postfix) with ESMTP id C827E40015 for ; Sat, 17 Dec 2022 00:11:23 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=G5AnnJqN; spf=pass (imf11.hostedemail.com: domain of sashal@kernel.org designates 145.40.68.75 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=1671235884; a=rsa-sha256; cv=none; b=4TWG/79zDJh69f6u2CAeH6KLb4wHNPdMotqXefAo6uESJOoUfB1o+ZbXIUUgMuKwFZ+mIn PqQ/DTeYdPwMFIm4CkSj4bWP/X+o/xT07k79ef+jQ+NlkMibXqYDW3mYw27vrVFu6b4bK1 1zJTUtQMjg0KnoqOvsRQbDL5h4PWTZE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=G5AnnJqN; spf=pass (imf11.hostedemail.com: domain of sashal@kernel.org designates 145.40.68.75 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=1671235883; 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=HZee7VCgZx5J/6RluiwSMIB8/4dBnAaUyFcHUI4PlBg=; b=Jz57forJEKnjg0xouBRa2t/6+wKs63a8n5HURPjcM7aQXHs1x4Mpsib/b5Q8gaPXRUPn2z 6eAG/QI/Jl/AsmJeTRMIBq2vvOtDNQL7eusFLUhK6soG5Igqm/pm/A7uO2Rh0rjIAsgRw+ Q6kpQpNUrxCTSIesIit+62CezCxvGOk= 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 F41E4B81E2C; Sat, 17 Dec 2022 00:11:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB94BC433F1; Sat, 17 Dec 2022 00:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235880; bh=Y7QUCuIeT36PPyWNZwZPgzNoFAeSyVVRpGZ7GZi+7cc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G5AnnJqNT/qJymgeecCYgyRc3NDLcvncZYXourw3GHb44m29V0ETQ8S0hRv61eBKn gMcwyVZbnz2L5sheozfYwDGNuhafidUs2qx7ztNGPMe5acjAUzTE7IRMHBZ+Fs0I1X JEEtK4mAUDZYbdCDspX7f3nQIuzgSD5Dg1Qe+m4UeL8ihoJzBCJEBcC+bloUigX56Y mlaljeCfyudqk1Qo6zVqEVPKRh91yHPLkoC6KqpkS8LMDX/+z+QPn/pU1C938WMVFM rf+6zAmvnO7njkNRkrxp1x04HOH3/bPLaj0xCe/fU30llNK3cEg7m9HYJpSEmNvRN0 nIJcX8/g60LRg== 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 5.4 2/2] binfmt_misc: fix shift-out-of-bounds in check_special_flags Date: Fri, 16 Dec 2022 19:11:15 -0500 Message-Id: <20221217001116.41497-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221217001116.41497-1-sashal@kernel.org> References: <20221217001116.41497-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: C827E40015 X-Rspamd-Server: rspam01 X-Stat-Signature: 6ik5xmaz6ycq13116cm9tbiuyad6u8ob X-HE-Tag: 1671235883-866728 X-HE-Meta: U2FsdGVkX19ThnobAVXt6mAWPozvPY+c1SNkBMK/ciFhOTTfn35OhPv0urHdrCmNG5SbZ2bQ1wojXZrAGMvjcMoGY551fRjCXExs8ns8iBcWbgO5kPKrX0KZ8Tmtz1Ghe+PSXdXO6qUiS8g+TZE5XMDWomXP085gp5WR0PA7CoNQDf3bXFarNpjjgCAQE2MZjBhOg4M4T/IQ06Ug+107aqB2JZp7aE2HqFlFPVoNhRbkThVSEt9RzcI5zEW/Ik4kniXXXE4NcD5ZihYLk69dxJT6/pr+OZDzdmALi4bxIrMSOYVqVv339z68u/xD0073R+uy1D5YSFe1l6JWCHftgLwotlgOPZJEEeMUQ88HnnxrqDyvaJ2gg+zpLnvNDxY08J2dEe816HwdTJL5ckRxUsVXNMNiJXJWDdhI6irW2oAT7n0Vu8KLkh+ZMrd08L+4anuPDqF6/tlauZslDv6SKdFsGoFJfxeU2Ab6STbfhv1CeJ/LB/i2nullXSXiIap9HTCIT1p368YIjsMRHCV7cqdH+MAq7Q89E/JPGNcGO0QaPeaZ7BGnqmkRC+CsvJZHpZ2RXQiYJQ0GpBBnGyzkRgjlwfmbUc6v2meWI8pBFuYcL2bbNGWSUYbwlqJILou7D79RdvspRT74GHUHbI5S+dptsayK/SWfZ6RlYF08C/FepLxVW3SttFU3EJNlnLVL53Ecazb74OZOCPrjZypYMxHZABiRQUW7OhjI/37l8CmLPP74zAa8tol63oUQ4XMiomi3l0USPFcR1CfC+TNM6DAEEtnJK9yMWrSPXJ1bvqk+/+gfDKBCandGn5zwluwZ5n+kLY/nZn5uGhcCTIj9hgsfFqk2EzHsUgmoOof+9QtbgqUL1FW89/I80AAF2Cfkb9bTRo/Cgoaxig69tewhC4vrJOKCClrANXeVjgUh+6ShcrjRC3ygfbgqZAEz2/gLZBXVbaowIEKIW+JjXpg mHpWCadR ij4bxq+kMcMDc8C0Q9YO2uPTy0m0EIAH+pEePahbktGE4jiDO3Nl86kUaV5iNX7VWyxrUWd7zCE+kbIl7deBMSocKmAlwY0lmrAEIdPMBYP699RrQgZLrQKmOdw== 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 056a68292e15..23b563ff0dd7 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -44,10 +44,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