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 18A1DC3DA71 for ; Sat, 17 Dec 2022 00:10:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E9798E0002; Fri, 16 Dec 2022 19:10:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 599DC8E0001; Fri, 16 Dec 2022 19:10:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 461308E0002; Fri, 16 Dec 2022 19:10:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 36A348E0001 for ; Fri, 16 Dec 2022 19:10:08 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 10AE0A12C5 for ; Sat, 17 Dec 2022 00:10:08 +0000 (UTC) X-FDA: 80249865696.26.14282F3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf10.hostedemail.com (Postfix) with ESMTP id 77897C0016 for ; Sat, 17 Dec 2022 00:10:06 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=IlyfWf6m; 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=1671235806; 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=Gw3pgv0sYwJa8Q+0GmpYfJrX5DL46/ZjRKEpuTyzMZCwPWxOUI7JePyaYIi6rsvO68FpH9 NEYM6zDbpU7Q0suEa084zP19Vwaqrze22PhfQD2M5y/19J1jevSRTghAkgTrVLgmh8ay6h 1gPEh6TNp6fh32YlaLUb4qRJXKtc2nE= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=IlyfWf6m; 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=1671235806; a=rsa-sha256; cv=none; b=A/Z+0lfIFyQqSojH1kGvHyXya3CQRTGMxVgXzvUMGTDUpPGp/vg+1PpLWvwVZhfhbuCgLv mRPFtFEnyuD92ofW23O6f9pdgtw8kTg/HitwZettXjV7dfwhzAxeV8XbEmQlTeMFIHUalv 4nun7fE9viWru98pUeX4v/Bm7tlc1bQ= 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 61806622CB; Sat, 17 Dec 2022 00:10:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A00AC433EF; Sat, 17 Dec 2022 00:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235804; bh=EG+e9gZtWBtSxd40PAuJyMF+fz0eBwH1KLEtrXDgJ8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IlyfWf6mKwBm9EuYC3WPW7UK4DqlULUSDhfw7Yc0NIBxqVBn8Az2TPmWjTtnYTowb bMbCjOG+16adOsDlj4uuQ5XAbg2bP0WG3MR1CZ4DQ2l7aeUj+mk7PSOeQK26BLxklL vAJt19wATl0u6S7hMdmXUGgl4K8p3J0DKt2WANSkD0b1mbJoDE+IX0GkQBOIaNd1yS 6Nir7dk+rxFsm0cu7T4lt5nxQjydRE0HQMr2HCM3rdj6Hvb3ER4P1PdfOaCJrrvu17 3RIv9tqCQ6qzP+dA7BaAgM50A2py9bQS6OJcWFx/Ea7o3I4uAyVGRwUzafbkqjJG2f +jmvXy+3bfHyg== 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.1 6/9] binfmt_misc: fix shift-out-of-bounds in check_special_flags Date: Fri, 16 Dec 2022 19:09:33 -0500 Message-Id: <20221217000937.41115-6-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221217000937.41115-1-sashal@kernel.org> References: <20221217000937.41115-1-sashal@kernel.org> 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: 77897C0016 X-Stat-Signature: nttonzhug9b4mms7ne8reaq4dw9ouddk X-HE-Tag: 1671235806-460955 X-HE-Meta: U2FsdGVkX1+cC8OqNv7AJPW8cY9u1bnmilr1S0VRtR7txatbYmL5FwZ7oQI8sftjSDvIO5PvQkNwubvJmcmgwkYwXbPLJ2SxnWnpRVR87YYRISEdTz92k/foENTvd6615DDhzz4nBDrlcT9UQ0bRaDzJZwMQE3IbgMTbK13dYmW4MocHv0DdbjyH5FnitPLIkdGp+6TMLaoxNy42WAw0rFpcr5+xZLmYsigB7GcXMTB6jAqckODRjN2HKYJxg3kzaiSp+7ab6zAPqBCW/hhBlvTIfWNIvmqfXoC3WFkl+xIkLc4lmdXj8oKJsz78SyGclHcEYHbdX9xr+6x7X9LnMfrkgdu42REs/An5PVAPHv9Fn0wPW7YP6EERGEpyKw1heFkYlQN6ybz9Z0ghYN6gpk3VgTaRa42LPD7y2g2TyuClWZsp2r25P2HIiETyXW0Z4Nbp69lsgWaGIqk/3Cpkisdx8A/EKo0Kd3WrSGfbQ3TcpE22OF5LVcorBxDG4X7Bp9b5n3BSeXP8RbQmBq6OnoJja09kupOXK96f+qwTvROQwihDRsHOHjIBqvNw8T75UNnIPyqiYg+97cEpdSTDLw9BvLLBnGbWsrDrUjUqpMf4JnIYwPnEq7kojZqJDgj9aDF0mh4i/K0WGsY1AgBCKtmcG1vPxu6bJ8BEAjICkaubuNhdQKBPQ3u7bNPypFoA/d2x4n+Zhz7EdqL8lLGXkJk0zjUuLPlwiFuHhYAZStc3j2vDYkZ69u+tYvhvUCBJ+JgNMF/oDkWRZa/m4Sh9UROZpFC45wblWRRWz+PXZNgsCrLif+of6jPfxL2iD104ur9zLOZ8flJEGb9PmwyAns13qxMQSbVxzmtekf8El/h/gcKxZMfDO6NkGdtBQkPAeBSJx0RLIT/8Hx79xcHHbQaXjOhaVohvcDhvnv9LUga0xPHXmljsoowk3K6M6gLWqFUxbqnbWgfgkXuxA/l iefJnUkk RoXDqzYcvPX5BjWby9Ma3MImcZr7Bcprfl/YfF9aGEB47z1ouytgaKkg5An84LK5w3wGs7JB3mxQrjTB5glEGP7NqAkizvSSPfdhZEKFa09ivxCaIgdtpWaUlFg== 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