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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F651C33CAF for ; Thu, 16 Jan 2020 23:28:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA44A20684 for ; Thu, 16 Jan 2020 23:28:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217324; bh=bwkaRjRlE85PiGBRvEmaRXUO7pIt+5zFzo7sHow+pbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2ovO86/W73W7Y6vlmJD8v115KeuUbaNElk953f4xmcUzHD2u+RbjDqslQf9sEfTB+ tIochP2GQFT9hu+kuGm0nIVkVJCYnrXHA5oEo8LHQXcVJIiRdtQUo9xxoHw6UsRfUF OJ18650oxLKq17MGVpGey4P8z4upWX947brXCBeA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391158AbgAPX2n (ORCPT ); Thu, 16 Jan 2020 18:28:43 -0500 Received: from mail.kernel.org ([198.145.29.99]:33600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391141AbgAPX2l (ORCPT ); Thu, 16 Jan 2020 18:28:41 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12D64206D9; Thu, 16 Jan 2020 23:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217320; bh=bwkaRjRlE85PiGBRvEmaRXUO7pIt+5zFzo7sHow+pbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=frEwzrSs4O6b+SjvG3bgpz9XnsBISi5ciPwRpKnt5n6nfiAYS7SHvAMnN1AZB1Ntt Xb4Xj3WBrJjb7HQx0Dwv9HTqLx5GxDcnTvvOdEykJLk2qocm11bK5yAJMrnmv7sJwJ O09nKz55rfYHrshFcxKW5XXaUoLFasCd7R2dZ0OU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Ben Hutchings Subject: [PATCH 4.19 09/84] f2fs: check memory boundary by insane namelen Date: Fri, 17 Jan 2020 00:17:43 +0100 Message-Id: <20200116231714.655118606@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231713.087649517@linuxfoundation.org> References: <20200116231713.087649517@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jaegeuk Kim commit 4e240d1bab1ead280ddf5eb05058dba6bbd57d10 upstream. If namelen is corrupted to have very long value, fill_dentries can copy wrong memory area. Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/dir.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -806,6 +806,17 @@ int f2fs_fill_dentries(struct dir_contex de_name.name = d->filename[bit_pos]; de_name.len = le16_to_cpu(de->name_len); + /* check memory boundary before moving forward */ + bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)); + if (unlikely(bit_pos > d->max)) { + f2fs_msg(sbi->sb, KERN_WARNING, + "%s: corrupted namelen=%d, run fsck to fix.", + __func__, le16_to_cpu(de->name_len)); + set_sbi_flag(sbi, SBI_NEED_FSCK); + err = -EINVAL; + goto out; + } + if (f2fs_encrypted_inode(d->inode)) { int save_len = fstr->len; @@ -826,7 +837,6 @@ int f2fs_fill_dentries(struct dir_contex if (sbi->readdir_ra == 1) f2fs_ra_node_page(sbi, le32_to_cpu(de->ino)); - bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)); ctx->pos = start_pos + bit_pos; } out: