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 47BB0C4332F for ; Sat, 17 Dec 2022 00:10:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D8A638E0003; Fri, 16 Dec 2022 19:10:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D3AE78E0001; Fri, 16 Dec 2022 19:10:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C02628E0003; Fri, 16 Dec 2022 19:10:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B11C58E0001 for ; Fri, 16 Dec 2022 19:10:35 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8426BABA65 for ; Sat, 17 Dec 2022 00:10:35 +0000 (UTC) X-FDA: 80249866830.29.C61B72F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf28.hostedemail.com (Postfix) with ESMTP id E84CEC0004 for ; Sat, 17 Dec 2022 00:10:33 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mWrtpq5I; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf28.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=1671235834; 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=DdcRIXp/kJMoeG/VmXkfapvXNtIC0zWOoL39jqg5NcM=; b=lGPlcIHY20+n7KPXQo7tJMv0YTjcFT67Tnrw/W6Z2bMUceWLIeG6HhuXIGmIBh3S9VcjfK 7mphpTgwLgzrgiIXfRLl6kYooGs2c+TnnLkVQjaGvpStWlwQzoJs+Jg9ka8lB2ZDdx3QI3 sQpLmPkU003aIxMQW/4z8ysa51kIMX8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=mWrtpq5I; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf28.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=1671235834; a=rsa-sha256; cv=none; b=cTx0oZNU4M2odkn2zZLAn/9h/HFmCs6yWoS5QcvVlcjmVhEptiqCFrMUf9X2AL2fn3HTcK vBV5fLyvAMaExvWiw0UiQynV2M8XKj9mEqa/bdwg5HsgavlalnFnX1l9CCWbzCl/gR1oaa /SQ9hoGlJVzccDXMUJIqVGGDyG6Hn60= 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 083AC6229E; Sat, 17 Dec 2022 00:10:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D23FC433D2; Sat, 17 Dec 2022 00:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235832; bh=EG+e9gZtWBtSxd40PAuJyMF+fz0eBwH1KLEtrXDgJ8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mWrtpq5ICOPcl4U33ijFf5SsKGIKWN0YwIlfpT5CbOqPFZhKSSaVPDPELFJ/6RNTa f6r4RSBC5U8FWr+E4Vs30uJX8k81QzmEmw6D7hd5aTHLPjmfsDJM7W4ZOlmucUMjMU DwqbUX6sT2lAfBaxL0H/Zp3cUA2HjXw4eBzsECRJ5ujNnJCAPGy8iq1pVjy+HxarJs Yh4pl8YDCTFgljNArpYEDucfOM6AjpSOTXMTFhEBwLYzsWWBD174tPtBzm9n/v3psx 6N9SXE2rmDMwgcFXUcfPdqMSQETbAVqr6Ax3fPv2ZmimEGaH5JZ2G0Yqt4CN5AqMyb rE/It/yBps6kg== 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 6.0 6/8] binfmt_misc: fix shift-out-of-bounds in check_special_flags Date: Fri, 16 Dec 2022 19:10:10 -0500 Message-Id: <20221217001013.41239-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221217001013.41239-1-sashal@kernel.org> References: <20221217001013.41239-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E84CEC0004 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: k1kaozq4ab3ttimawtus4zkixijaqsc4 X-HE-Tag: 1671235833-869447 X-HE-Meta: U2FsdGVkX19WevCc+U4vZxpqYCvuKTT2e/3muoLZ6zXLeVo5SJRp87cKmwDBY9BDKcJt7wVibBpuDdBbpEKUPMRyYK+jR16OJIbR8XzS9dWZ9E4VSWh4i+fEGSFt/GT9XfIu0mdUBaxv5qgHvDWXiJv22kofIAE85Odbva1xsPwqraA4D3rz/zS7+0Q2Xp/qpBQpeSLjT00lnzSLHeLXs2FJnanIHu3WF1OeXVBrRLeMUuduffihFyOYQq93buB5BHGl7W4Qpox1MsMuDcCYcPd7eb3eawj2ZWNxWU3DpRNoIvEqje98Y7WShGIzSarFHpBwfazW2One7f7w/TAWToatjTEveYGvusEoRLuqlSyvCgvne1ht1/uCuVEDwlZOWj42fpG64BrQ3UHBFb5rvzBB4bhjpxtJPACPmcNvYNr5423KgfPb85Vo27zz5qabL6n4Vpc/vjiTzT+trfabQ/yaTKARI1sq1nkCy3PetJ7SRwAMmaJan9wEEinxzyUX+AQRajgaGOoCCp5CCPswJzt55goQbpYwg2kH/UOsR1b5dS9jLl69GlscOzbpH1UyIPO8S3XXCtHtUSCBZfbI36+Cn3It+mUt3nLdCca615MVeMWq6FeQSylQC5qG/IufVQ3z2GjirfXBXFWU4dXuz3fS81JOe0eU24KB9VjY88gYbRACZzaz/5ODxuaCIsi2yOstOJ4C5VqRw9yn6cxOUQET1jJr3L6zrkO/jhp6FQr7B47SyPBO3Yw23WsIaFmH9tpViOPLUDJa7hU72xu/WNbre8QTmsUSIHM44mX/AvqAY29AVvR+VlAUhWCnOjdXD8xG2GsdvVfLOG+Mx8KnOMn8WS1aj9qdzEpVTojGiW174ISBA2zTsmJmiM+TF0FEQ/J8WXclcV/T3gdfFVY7q0ol6MR3Y+lfYGuArLVPY8BisvgSvFKu24rs9NbPhhJuR5PW+ciLO965AORIj+e i0snm1V0 2fxtoHJycyBK6dG3QNEoottFtIzGGJT20PRJjvRJqaW8OEwHxuqdl5fC0QSMQCwM2xFOniz3s/c4UryRCnMjAkPikw0zaKH+heIzOobS5ezyp3/BwHRYKJPEAew== 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 e1eae7ea823a..bb202ad369d5 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