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 D23B1C54EBE for ; Mon, 16 Jan 2023 14:05:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 143266B0071; Mon, 16 Jan 2023 09:05:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F3A56B0072; Mon, 16 Jan 2023 09:05:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F24426B0073; Mon, 16 Jan 2023 09:05:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E29D96B0071 for ; Mon, 16 Jan 2023 09:05:54 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8AED1C068E for ; Mon, 16 Jan 2023 14:05:54 +0000 (UTC) X-FDA: 80360835828.06.EFCB84C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id CC5924000F for ; Mon, 16 Jan 2023 14:05:52 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="FntS/p1t"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf27.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=1673877952; 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=mi/BrMidk8kVW4c3dKv1nlJmDmPY4jH/2hd5Ge1Pemw=; b=an+gkae9fRWxSq1OYBlqoQROXhmtUJwV5cOQJmJgvY5fTX9WThtEKBZ8Ge89SwNMdaijgd gzS0NPBq+1EpL+5U4x9nL2j4sjhLp3I7R/tuzMpkNtMAnuyEcT+ERw+MfwMouAxVGPvScq MxXu8af3CPceKAqz7DUIhRSStXK+G40= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="FntS/p1t"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf27.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=1673877952; a=rsa-sha256; cv=none; b=KNJsQ+fZuDbiMEjMqsq38sHqGAT6uzwn057f4ko5a9rKHbaWvLZ9L1Q6Vp8ouaBjwCA1AO CLk9hpsgCKhSz3lyWbISF+/xME3FuPkoz7XOYiU4t+rqVXM6vm7G7VDDzImUJk8/iup6Yc G2uH7nNMzoqS/FVsGg/N/yCKG967dXA= 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 B37F660FD8; Mon, 16 Jan 2023 14:05:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 485ADC433F0; Mon, 16 Jan 2023 14:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673877951; bh=PLWjoElbUUTrwiueek+ck3ZZEqIQCzSUwGIQlRGcNmA=; h=From:To:Cc:Subject:Date:From; b=FntS/p1tP6prNIlq7UgMdz31dhq+bucxf96hvmhw/GDGOiDYC1B36CeebZASG0cj6 W1hAsVX5oFsbqYdv2UbvC57vDm4RvlNyy6uhfjIjaomOX210VO+eDQ5teJOfW077us t9C5n4U7B6fI+rQTpfc5GpzfpT9aRx0uq6nIEu+TeC+FZExSbcVCd5RJR+GITJnVa9 iKk/L6Iz4S+gKTOUr/GJIhK/jGEFB0cDOs5RYCL1MQ7x3n1Qgt9Tjf1eJAPpUVnsdE yYEmhF4OH2st2iloguha03OhnrlGWYHIuKDpjUCNJh4kOJRcCrv//gJTFCh6Swl1K3 zseUvFKUxV8yA== 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.19] binfmt_misc: fix shift-out-of-bounds in check_special_flags Date: Mon, 16 Jan 2023 09:05:48 -0500 Message-Id: <20230116140548.116462-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-Rspamd-Queue-Id: CC5924000F X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: nkndcopq6xojfmwd7z8g9ustz713djsf X-HE-Tag: 1673877952-374682 X-HE-Meta: U2FsdGVkX19wGAA3CGL6ow142mOp6PO2baUJjRxRZLdJCCvY1X45AjiILLsgnSFS/dmKewHC2ejYmJT4wjY/Wpkv6oyjHhJGcJBGGOJ0mBUjJY472VKINGVQqoSlzeu6Ccaqs7Yd6E/bCMCvZNE9pg/I4xsM173IqT2qMVdqnpfAV9Czopu5RkMszKtvsFRVYOR9ZwA/1MoYeXjhQggRvjFGvrpmVUAt3myy3euDnoFO3Kn+5gqTSKgJq/vBvzA0Y4AxARKqUBOo4CvyTgKBmrzLmngyVdGenRpL7Thv3HT+mqQDC/paCA32eLAvE5a2V7KmhhaGNvvLAcKLH+taq4/QVplKcsm9yuRIZAUt5VDg/z3aCLwgaTQxw6QPYJZl6AiCw/+0i25ln/vwSmHVakEd+L+xR871FQNP3TCdeBpv0RRIzG9/Ga+RI4TKKlUOC7ktl4MZ+ojZmGOXO/DFKbSBIqQxEJi6ZfzcYsDNxeoMUUumbVyaPAmGqHi3w7SDPclLZtjORz1nzjr5J6vjP4/Ib8336PmCUQMuPgwvlY3EUDkbEmuCyYZn8KsMfBN/Hc36XvPMZVmWq+RZ8EZVdDmyrvCD+LqKaG1sWBJ9zw0u3Cjf4QoJyc0/GPMwVqjMkLLO3odruz2QiXS1VGC+1URR8hGkYjzUn6RYwVb7oVxc+6TZRVsZufXY1AYIM4ViNVhvbb5NA+dwrgkuGTiTrbNQ98sXw8Pv+9hdatYO82FqqcaKTV5fTEPDW+NuGij8xYjCUQF+H1C/941ABPDB0IDWw3sBCe2tvSnkGsY4GI1uTmkI8Gt7kVr8+EtCD8vPteYzTmRIkm2bLFlOUc1DQqpXKQv3hIhUifgiSeHt/TjgD/7l9y5go7a8gUT6mbO7wO/lCoI1dEHlcmmLoCfUbi6lzLx7lJhyt94aW6DvEddnpUTjcax4ZyWUk5YD19fgoNe7hjdsx5ss666Vxh+ Ob/dJMRn e+VBE6bOsLIns6lGceL+RQ9dURXhLOw6AT35HSgjMW+b5CyBeaTP57LWtx4lu3YOt7QR7HszzsPlVik4UnyuS0Sppsfa+D6j8EbGFFz0F4k6ZPcKvE34ISRkkvQ== 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 27a04f492541..8fe7edd2b001 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