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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 0F898C433DF for ; Thu, 20 Aug 2020 09:57:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D608520855 for ; Thu, 20 Aug 2020 09:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917421; bh=M+1+zlegeMYvTNTb3WfSmsAd4BXj05tPC2metWwEjtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oLSPbCapYvAPl4YXN1D8OtqiGtk+UHRJR2I9wsiYnzZjnVd6maSsXQXzDqaYCz417 wlZrk31/akSrwSKbpHFb/tzh5KEdrkrVsKE+L/83Al/bnvDl1naDXCLH+TR4C1U5zg urx/hYoFXqzqBgDOX+d1+MX54OqtMxWBcdnS1ZCk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730076AbgHTJ47 (ORCPT ); Thu, 20 Aug 2020 05:56:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:39810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730095AbgHTJ4Y (ORCPT ); Thu, 20 Aug 2020 05:56:24 -0400 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 74635207FB; Thu, 20 Aug 2020 09:56:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597917384; bh=M+1+zlegeMYvTNTb3WfSmsAd4BXj05tPC2metWwEjtw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SGuuyoOab/4q8CXU6pYrbqjv0YEZW1feGJnKZU2H5Sqzlh+eHADlLvCMYIAMbjtCE s5cuDMPFzI9xQi+ukvcOUDncfNA6m2VLCJQjSJedHykulefL1BCTwrJk+X1FLyHUjM XkMz/ZEL2aNTRjHa6QJQy6oxH4wijqt5MuafgNyc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.9 013/212] f2fs: check memory boundary by insane namelen Date: Thu, 20 Aug 2020 11:19:46 +0200 Message-Id: <20200820091603.001144682@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091602.251285210@linuxfoundation.org> References: <20200820091602.251285210@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 [ Upstream commit 4e240d1bab1ead280ddf5eb05058dba6bbd57d10 ] 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: Sasha Levin --- fs/f2fs/dir.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index b414892be08b7..79d138756acb5 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -843,6 +843,16 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 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(F2FS_I_SB(d->inode)->sb, KERN_WARNING, + "%s: corrupted namelen=%d, run fsck to fix.", + __func__, le16_to_cpu(de->name_len)); + set_sbi_flag(F2FS_I_SB(d->inode)->sb->s_fs_info, SBI_NEED_FSCK); + return -EINVAL; + } + if (f2fs_encrypted_inode(d->inode)) { int save_len = fstr->len; int err; @@ -861,7 +871,6 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, le32_to_cpu(de->ino), d_type)) return true; - bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)); ctx->pos = start_pos + bit_pos; } return false; -- 2.25.1