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 21404C4332F for ; Sat, 17 Dec 2022 00:11:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA3D88E0005; Fri, 16 Dec 2022 19:10:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A53E48E0001; Fri, 16 Dec 2022 19:10:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 91CA28E0005; Fri, 16 Dec 2022 19:10:59 -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 82C978E0001 for ; Fri, 16 Dec 2022 19:10:59 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 58B50A0366 for ; Sat, 17 Dec 2022 00:10:59 +0000 (UTC) X-FDA: 80249867838.05.CE31A72 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf20.hostedemail.com (Postfix) with ESMTP id C1ADF1C001C for ; Sat, 17 Dec 2022 00:10:57 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=IR+F2bYd; spf=pass (imf20.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=1671235857; 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=DwQTpBSllb96W9VFioyZdPJR27cPk12Bcv46bVgUStc500y1iHf+TgN0zaWkA2KwTSdey7 TkAwZfd/S2utefStV3KijBNzzlnZJguL1eFQYRval3kHXHTPAa2SnJH+DJHid1QA2gHcSs AyR5x0AaLMCZgjpXxYN8nrsoT+AVmIs= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=IR+F2bYd; spf=pass (imf20.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=1671235857; a=rsa-sha256; cv=none; b=ZsYyOPkD8Dz7H5zSZi/yP1PmjYev8IXVadrDHl31w6wrpDRSdgJj+L9y8dwH4wxKbhCB46 udLCPKcjIFt5uLQfgmFiNJ/ngkn91eUdEukzATHdjtAC00c19sdQwwRVNpGRCLZhdsxz8x 8PVT0NipwSVlr0483Z6q6sY9Wb+fQ70= 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 E279C622CB; Sat, 17 Dec 2022 00:10:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7129FC433EF; Sat, 17 Dec 2022 00:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235856; bh=EG+e9gZtWBtSxd40PAuJyMF+fz0eBwH1KLEtrXDgJ8E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IR+F2bYdblhvglt4e6TMMKPGQ/Zu7djvxwj7vmeZ+jDClajtsACujBcl1xzTpwSa4 XNN3BEi4hc6cDjXchOm1Z7MJaGPekP5VBoSj0GPEKxWmWVFGkKWDAdyFdzGW8x6fxc XZvz+l65Q8XADFx/VczL1hpYwcBPVLiw6MtzmX3qpYp2F2i2gYNorQpdeub5jP6AdI wRsbyH73Kr9+TrqGvMlKoClujA7avsON6UscjmyokNO9Sp0gy2exyjArWI1wQJuHmo hY+55nqIneH/PSrzgU679pk4aTyHw3CbuuM35mw5IhAi/Iq2gTeZqi1nZ7qBCFJ/0Z DBSW9AqZJn08Q== 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.15 5/5] binfmt_misc: fix shift-out-of-bounds in check_special_flags Date: Fri, 16 Dec 2022 19:10:38 -0500 Message-Id: <20221217001038.41355-5-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221217001038.41355-1-sashal@kernel.org> References: <20221217001038.41355-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C1ADF1C001C X-Stat-Signature: t837gm6fwqmzsczrqcuu48hwcs4dn6rf X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1671235857-535837 X-HE-Meta: U2FsdGVkX1+9/C028EMpQRAUeD1UfYChH8hZss79sWOYl83EqQIlArRqn2U4WcoWtSligrAPmTS2Vco+NIHE7Qf2ydsGtuGWMfOkH4QgmwHVBzL4ZB/uOdTteqs5NRT+t9M5fUxbn5HUFEjzdH+jYwOQ+hT0hcJAZitZ/a9iO2qcFDQViLuQKMdFsOwkhydN2GRMQ7I9l4GpzmNYwPUYDArn45/BGM4eIQJVgTQ4vfxPmVwyAPaUA2Mtj4ivj0i5+L783QR4ooapRQh0ns50fZ9HZDgusxjpf0eyVkhEOwU8ehddX84/VyZN64EQOiYHK451NCW0bOYxNAeXlohqQ0vl4zZCpW/Js89QDtJr8EV5A7WCT63mGYeRp19K4mT4KN6wm1qxlqIlubPhxZ+44rl+ExUnXUeMVPxMoO8niQ7oagkUrbQNPqYK94RPQk/uAgV6SSnFZF805rM3B/ISsqm5saS7EZ7AStJUEgipoKrjXxZYC2gQsqyMY1u6VcaCl0D2NORNSZ9Fa5tihXRahq0l97E2G3q4qym4hi/D6T+dNbLx75hVq94K3xp4gt4eKEvgFYMjLM9JWL9RDR1TAAmUrW56daqBJvXVeKPVusXApxNbhsuCg039AFpjXSEC4VT6tW5PszdmkrMKm9TyU237aYLJPAch3VNHRLnyd6gFqId7szzzc1UdcuYF/MI5L9AQS+WziKrM8l5T/Fp/AkeIM8MRvmSKefvJKD2YazK1lQatUIE4rPCH8pvxtaQLWAsv5i4plSoyUfpCyJZ+hZ6V59qYnX/xDMs/rPC9P63FLjBenZ6Pvo7hw5rKoARL8NoA4NY37AAL5Do4iAMvNDKXuAd1oV1ye+erawY3wnd9O65gsMy5raOpFxaCpKp85FqiUPNQzqL5fCYOjcP0+cVCipgsiAJTqrcljisJdRABwmnVxBBFaOsNjrL8N51oc6WBNH9W8nQRkcX3GeD fsVqT/oM 6+Y+ORmN3AAo+b63hBA8bcvAnj3pievv5dMct1xRWxXDiOXkz2z9YqOdwohU5uJUKKENSpkbajPx0AWOH4YR8UEnUQvvnreftxskvZa6/wMXXpKUh2nyANMJ5SQ== 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