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 D347CC4332F for ; Sat, 17 Dec 2022 00:11:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 722088E0008; Fri, 16 Dec 2022 19:11:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D1748E0001; Fri, 16 Dec 2022 19:11:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 598E68E0008; Fri, 16 Dec 2022 19:11:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4A52B8E0001 for ; Fri, 16 Dec 2022 19:11:36 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 28F361A0854 for ; Sat, 17 Dec 2022 00:11:36 +0000 (UTC) X-FDA: 80249869392.01.05E927A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf10.hostedemail.com (Postfix) with ESMTP id A2EB2C0009 for ; Sat, 17 Dec 2022 00:11:33 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="BTkob2+/"; spf=pass (imf10.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=1671235893; 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=pnFnDERtRZq274oSSIMyEfKvlb7gpvIFLonGFbX1F+A=; b=x0SBIs4q/W3loEBge4mWkoRbG0AOD0huI1NuBTI3iXlMNNsEGolTNCaw+Oy9Rv+H9czYIn 6uxUX8Ga5IDjVgWcnNvJ6kTOdwV6SUbVCGmjXw1ItLlMn/7uljnsoqU1uSzeEmc346Nr3s HoSlJLjQZQrmM2ClxePTQp32pNlvE2U= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="BTkob2+/"; spf=pass (imf10.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=1671235893; a=rsa-sha256; cv=none; b=a0+nRfIV2ACfVovpMhYzLAwfYJ5CNk2x/IY/BS4omGoTs71FyPnhCa5mqnP6wVj7AX6E1J WPyp/LW0eoHJcTuyi4UPihJAv9kczQCLKu/RT0bqjmic+k0lnucPJXxzl7SO5sB7gPE1gk U/t3fsO9anScHTPR0N6A46Vz8EGaM2c= 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 DA7D962042; Sat, 17 Dec 2022 00:11:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61EA4C433F0; Sat, 17 Dec 2022 00:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235892; bh=vMndOG5sdgeg8DD+EqgRVsExZdtKN+MFV/3z5NYiEF0=; h=From:To:Cc:Subject:Date:From; b=BTkob2+/C9qE2PyryiIjgdrz+6SMuXG16swzphD1uoLabaET6+5HM2b86SXYxB7H2 efnUf935ensHLDpxZqoqR4IBT715MCgw460zPaQ+GxvPaGP/dzTYEbA4qxWLNuxbI+ d5FinO2xNp61sT2qOmsVjU/haZyXKx5ZbS+DoYoU0L2N9TfrimUfCHY2R89DoKLXHa sQMM2z1XLqeEVbUs7n9yXZcdsUDhsI7ghigmsRTKio+F6MHNT5dqMDkBl/yw44dISJ kYwM3NDt+Tc2++y9o6LyNqpAQiMoa7fWH7nmj+hojKWi4vIuV8NUEH9LIkIkYWHplB SM1m+BRuVPkBQ== 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.9] binfmt_misc: fix shift-out-of-bounds in check_special_flags Date: Fri, 16 Dec 2022 19:11:28 -0500 Message-Id: <20221217001129.41587-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-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: A2EB2C0009 X-Stat-Signature: ngacmcq7dsa958p697qf6gf6o6n754hj X-HE-Tag: 1671235893-283855 X-HE-Meta: U2FsdGVkX18uzSCMOpqNlHAkz+SpfKhEIOztZfsLezEdnTKuu4dr1YdY1azZnz+3DaKD0jQ3SPrd4kYa4y+mkyCi1Zxs/lfCCBM1phRrg41IuUnCW7pk2e4asxI/vkln4ayfpyhne+wC/svlLYJdt78YipMy03A7g62ZKesaIezv+R93IYYFNhwAXuXq7DCgb4ZUTDXOto8i9UvXeoEvE3Zda66cp6xJYnaHEAhwPqN/xsw718dF9r7TKvStRbSEsyHl/R3EfOCMWlRTY3lnp/AfQPq5H/5g/Lt2Z1CfuxPV/uSuBXmC9FOnCJVGya7StpJzhjBNkrZtoFjylVZ1nskSGG7P3UjJB+1Rrn4DpCU+LzVoFcXK65ZsnHa3WUfwf+uWU4FHlZkYnCC7e+c9J+W3OE7AnwdZzgj/NSHQPbdXEYNUQ0MxSyeL3jEtccUsgsvTsis8i5F49dM8Ylgd7uc4+GDpzOeOXFKlwbS6+0SM/stUTacdGDlf834z74oWGGqbWiZo91k/K5JDEl+c+eK96HuPU70sT/wuNnvIbAje5RCzon1vu1VC4tQpzbgBQLU9WYlumNlhNKgZjwGDIduJsZZzQIoaycXMsZmANcKqKggccTa4dZFg4ukNbLhBOngcGS0h0socFA0SSSqQ7IIIEbEkWC4YokOd3vb503/j7PS7K6GjGEKKUnpnIY7VFiRLrEMIJP5vA/Al3bM3WYY/Law655bvLWRekSyOeNXwQjINZjQRQR/NdMX2TRhLh1Nz75sJubKzkRiswrg95AaqjY7lUNy39jfhNh6fAqrZPjHdD3USly0wqB8O476L/ppo+FoqL9niMBUeMoUBGOiAWlnA2VSShaJsyzf3sLYBADk8aDC9tHmpoIzVwIoxBlDHTRdNuwnKmbmrZNIAcThva6ziB5ri0yC6YdrZqCUbCs6nkasoOb6v4MhB98aI1uXvJ1lwLevjPVm3LPk WWQ5uWES fB4ohWr/s6ixX9n3EtfkAONXL9M/WMy6mfQZVNjbcOaLz6c7Q13oXHx6dXKdJ+F11Ew8gW96KP9MsBJyw/Si7XpOj0/MveqCho61cVI18jQ8zh535g3uLS4NbmQ== 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 2bda9245cabe..558e4007131e 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