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 23953C63797 for ; Mon, 16 Jan 2023 14:05:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 90BE46B0072; Mon, 16 Jan 2023 09:05:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8BB8F6B0073; Mon, 16 Jan 2023 09:05:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 75BC96B0074; Mon, 16 Jan 2023 09:05:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 680546B0072 for ; Mon, 16 Jan 2023 09:05:57 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 2BD551C62DF for ; Mon, 16 Jan 2023 14:05:57 +0000 (UTC) X-FDA: 80360835954.25.58BF94A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id 83DE8C001D for ; Mon, 16 Jan 2023 14:05:55 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EH42kW6q; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf22.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673877955; 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=KOPq5BIWV148xcceR0Xvgtz03wPrlubtIzWklDk8+Ga5dK26sqar2GvhJJkXIhFDDMngVZ v8LzkBiocCv3FzcgS8xMKeUjCsPWqiXb5MKgvwXV+v3fq4W9lIXpXFEWAHNdbkeRYbyy6K WH3xbK14V9yvUkfB8wo5V7bSP1okxIM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=EH42kW6q; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf22.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673877955; a=rsa-sha256; cv=none; b=WxYJJMXaJ1XA69R2XnBH+V+Z38l04CWQVbV31MuZtczJDERNuRGkj22rttYAIq4h4E5RC/ EXQP+KiMc/4ZT+s+iNRva3ul8fYT+R5XKJ5c3ygg366CSUWlX0ZtugybaU7fQDFfK+YvdD VkpJOc2ltKSaHrnlBnvgmLWtKYjBTDQ= 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 B243160FDD; Mon, 16 Jan 2023 14:05:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45213C433D2; Mon, 16 Jan 2023 14:05:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673877954; bh=63SC94Ier2TFvKzC6i0Z1YJOo/PKtnMOWVRuPbn9sTA=; h=From:To:Cc:Subject:Date:From; b=EH42kW6qIa1uqfLJlXw2eiHpJyYoTCAQB1uBVDCRYLl2y4XPiukIFGSjveP2D957a 9oqNbfjoDDH+Atl2PtsFpnxACPNCR6CNJXTHI2QmLti0WU7kVWmQ/YbpLWwlzQXg4M 7R03hCyFptXwkYY+i4wYOaygSZHnwZJ9vbYXWpOpVo4VIrpT612Ph1q3TnJi2DcdEl obxXspajCsv9JYiPBrcTXDfE0h6Zw66cCbqbL0CecVM2bSZs4VkjPTxD9PGb4Npz+T OVNXGZ+UfXmo2w+/K++5phcS5VkO8OH7rEl7dt1Br3DEWiJa2sypWUA47w2IVWF5fn 9yb+4V8ncgPVA== 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: Mon, 16 Jan 2023 09:05:51 -0500 Message-Id: <20230116140551.116487-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: rspam02 X-Rspamd-Queue-Id: 83DE8C001D X-Stat-Signature: anzu3ct1usc8hecfhekn44n7jm5nbbd4 X-HE-Tag: 1673877955-981861 X-HE-Meta: U2FsdGVkX19wEhkWTA1tGuNIzSMlA42jCGl8VJN5FMRp3Hzbce5F+iw3xAQkROBVBNcBUoW72egiWE5KKFlldZbD11NrKtNVSeZDXr0r71Seja/FaQZmaO6MCjDTIZmNRygT81OFNc7hVn7jyQ5Zbx7sh8n3olYKdv0R0S8i5NM73uv0FbrZfNbJ51/hXHJX98ke7TOMQV7cAuOIwpbUylvLuKG9xEE0rJ8FoDfiS7Sls9itriaGT0hLI/uza+dLpNmxvTz/MOF70wu7wbZGesiKzGvnv6+LE6NMh7/KZ2VTPQDam1XL90MPHVsFOgJC3vFR/iJO+2eBmZDFHNVEDFp5uqVDGHkXuXHP/xNScH7J7iLJfxM6TpI0sZpvPpo6cOZIjRVxuS/efKSiBOnJJ2qKl3UKI+BCTIKkS/jyAje8kouTK3kR0NaOQJCc+G4XnokLQK7lx2N8+FS3VaZGxFkxufP0iDJZV7UlHVI5o+4CNDCcKsT+LJHAbEscluxDQzknkghqL5/STtCl1yZ8XHJoQtVg3ZtOsppKf4qpBrdBVpupiIPfShY0OaJRl5E/jhJOVD11C1RfYTzQIdzeKdRPJTGCBNinksVx1YOuAo+b4rJpwjjPgzs8rv+tp2A83txiDqhBQZGdwBuJclvnh6tR3l5hbrYtyoQUxlM4fuc6hZQgEsuz2IVu2H9FofTx7mnK+3InZlsvL9ZTDt5b6++axFiI20G5tZ7ewOydnDSGsefU0V+vRxBUF1d1vaD4CYMOG8bOGp4ojI5yzpWGFsUIfXI57dYg94vjba+NWK3C49ak4TfM9AIFQEep3zA+e8xwywYhB+PLTMNKr84Vek4coMVKuIgpDwHqpmMcS3WZdVx+c2WjGxGOK+FKa+AlwvkexGHwtg2IDp2NvrgVdGbcByfgpCjgonmC+Vy1OKajXyutkMjZE7JfG2Bb8lkoeWBqDEnxhlQCHHa5vai fbLbclMw k0e3x7ng/n92uMqRc06wViUIpNARLFLOPC+yvNHuPCm9louZC/1j+q6PwpRiWZKj/OfdR5ToBRMggJBBGRdzpuQ1LFbo0cQCJRRMJSLPlcL6id1NMbTcx4bxcrQ== 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