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 B5A9CC4167B for ; Sat, 17 Dec 2022 00:11:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 575608E0007; Fri, 16 Dec 2022 19:11:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 525138E0001; Fri, 16 Dec 2022 19:11:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 39E2A8E0007; Fri, 16 Dec 2022 19:11:33 -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 2C8958E0001 for ; Fri, 16 Dec 2022 19:11:33 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0124A121246 for ; Sat, 17 Dec 2022 00:11:32 +0000 (UTC) X-FDA: 80249869266.20.80818AC Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf19.hostedemail.com (Postfix) with ESMTP id 24F1D1A000D for ; Sat, 17 Dec 2022 00:11:30 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=TN9BFkUH; spf=pass (imf19.hostedemail.com: domain of sashal@kernel.org designates 145.40.73.55 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=1671235891; 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=NkdI6uhhV6+nTvJqZKZ7UGQJqEmcBwH1o/+J+cY85t6MMxtoy8gqnFmDN5bwzzofnLn2ou TGgCPbN17Y+MDnACP+D8AFbbuVaozk4UnRVyeDIkGdsppuob3hcJa+aEPxzHZ/EiO8CGT+ 6YBphXmKR5/vkpfIflL5h9qEuRc/wTU= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=TN9BFkUH; spf=pass (imf19.hostedemail.com: domain of sashal@kernel.org designates 145.40.73.55 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=1671235891; a=rsa-sha256; cv=none; b=xJcFOsvYJGbEuVSib5vz7vDv8S+3MRbsVdYNCdCb5bloY6SDNi21LC5kUMbCPIpG/QiHIw XCcqMvytT0PR2tJHV46nnmuCqVTlUIYKljyFj3EHv/i9T6hjHaD2DM0BevAokTFA9JdPz4 1pkvCAD9zx79SDj+EKIAy6pzCVi9LK4= 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 sin.source.kernel.org (Postfix) with ESMTPS id 770D4CE1CFA; Sat, 17 Dec 2022 00:11:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2B79C433EF; Sat, 17 Dec 2022 00:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235884; bh=PLWjoElbUUTrwiueek+ck3ZZEqIQCzSUwGIQlRGcNmA=; h=From:To:Cc:Subject:Date:From; b=TN9BFkUH1TWsdjogqt4Uchmmg2roCwf1UWvZvw2PPWvWUtZkK7fL8UfO3IaELs6HX qXFvzFMQAwh/bafUaTn1A4GpZ7qfrPEb+ZXkUmoD5BBkuNb+B535QveMhbYVpyxsaH EcBnaYLdQCojHw6d12pOEVAMkjXc1rXzvnzvz72VhLhhQVMli/8+qTQG0bfwaQCTEa Zcx65QhrCbHVYhOrmqQMdG3G4r3+yt7YlSQmg01Nu+h4Is6mg/SGLpO/cUJLfJ0+oo 0rpO+w6tm+l3gFeBkPLtW1iAyurzQ03SqXk5i/HqpT8gh/lYQIjDq8NgFGgkNsodY7 dt0iLuo9mY5XQ== 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: Fri, 16 Dec 2022 19:11:21 -0500 Message-Id: <20221217001121.41535-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: 24F1D1A000D X-Stat-Signature: dw9qzjhisx9hyof7saufs15h6g1j1nno X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1671235890-198981 X-HE-Meta: U2FsdGVkX1+7fNvbegUYOl319H5a3E/ulG+aAAba3iYk09eGhPy6nyFOkGJv0KPZNAaSGH3BoiAoIEDIuTHtViNkfoNJG9YhTNnoK/ne5JaHV1+jcZDQslkFjCi/HzZnEeZPTqPpjiDPrtcCEGdDkFUNu3n5pRaiUCJvlRVff7PqcBmVfVaH4wutJ+yzWwGsEX8tfOffKNz5Skz/+h3zYLBFcnDHkoM5MeG0VaSHERs2D4njveqIDMPoydb8z30OSDeMk96UPJaHyzkVvaKUoPfZPYRKdn0l7tsKuAHsejCWvEOzUr1Cuo40Jb3ILksDz81EA9+0LNqVrFlqyoUtkg6o4P9q31VkvQeUgUpXemEl8BeW43GlGW3yfEBeyj0sHUr+vmql/f5ayCROBs7Ansr0z+k31HPaPrzB2gpt1Rh2k4OkfAqhgMG3sSV0JzDGH7ft2uWtnEK2R3Y8GDyHammtK7jE2LqqJuYDtsXv4SR+6P/ZWedrrwychcuhWKdj19P8i8QONar6F39O1+WoMotYeicBQ7n+rNl2bLTKbTHpSTnZp2KTCQpWpTv1i7Py03lOcuBnTvnoSXCv2lEzp1VsPYrO1Pba+C2HPy4OYtPDqgEGYciMYoy/PJD1dC/eaYuEidmuA9o63PTm9trjWHxLoI/KAVZOAWd0Xd6gXUP0+xKuWGQhfwhit5bCuAPwD80LkN5Eq4ublkM9M6xPT/I43/mQabtexZ0XUWqFnTovknijVVQ23IaNA+/wojPCPmZFXSWPBlZSrQOhUzuXqHJ8kYbYwFdjZnm823hTpdUYmJZSD/lCepdyZjGDbsSpYUyk86uIXlFqvyYwa+qRCYg54+aAZ4h2QfBNHqc8KF5XMPaJkUJBTiCLpX1/G4Ov4ykdQb4sZIj55xrnmvOSP3SaSrOA+IChvJkbQn2Rl/JuFd3EAHvRtKeF3lns3pt3nwSv0644gXEc5q6TNjZ IqpoTgop 3v28Agn0nWsrszE6JwvXSt/f9V5WKWgQm58gUIWhyg/C2KdFmodJ7Yr16Hdh+niAmk582V51PbiZqnUjjv4YupFOldG2x8ak0ot/kEIL+qd7XcIjZ7yV7cZ5yCQ== 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