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 02072C433E1 for ; Thu, 20 Aug 2020 10:37:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D4F3920639 for ; Thu, 20 Aug 2020 10:36:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597919819; bh=C2e74BvxcPUgeYI2NSIS75gacK4akmEZa73yXqLdLok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b9snUdtit/L9Z7tr6PDz/MOu4tZJNQxSNMLbF5jJQtDcNr/NHN3Te62p1MRPrRPCn xLkO8mNcnNTlA/feVUE0fgn6+S9vAI8MoAoEReYBNrCtIojZSLz1hM9UqHrU/Edo7k hdeqzjnTxeiRpnpJRNSvg202EYN5Z4qnFh8xHf2s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728410AbgHTKg6 (ORCPT ); Thu, 20 Aug 2020 06:36:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:41266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731179AbgHTKSl (ORCPT ); Thu, 20 Aug 2020 06:18:41 -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 67DC82075E; Thu, 20 Aug 2020 10:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597918716; bh=C2e74BvxcPUgeYI2NSIS75gacK4akmEZa73yXqLdLok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YR4i3r/il3tyR1jkJCKKBmyBQ2/vwjANtfS/P+1ALc2I98qIcI03xPmREBRXeA5cN DhkUZGniKmn7iiQmv26ciTgLt2jhvuECw2BneRkKApCuTpS3Rfd7T+Nb+gT+L9VefC GCcr96MeKlJnA7NKjM+RIJh4TF30ec81RkReZX5o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gong Chen , Sheng Yong , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 4.4 011/149] f2fs: check if file namelen exceeds max value Date: Thu, 20 Aug 2020 11:21:28 +0200 Message-Id: <20200820092126.244160395@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820092125.688850368@linuxfoundation.org> References: <20200820092125.688850368@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: Sheng Yong [ Upstream commit 720db068634c91553a8e1d9a0fcd8c7050e06d2b ] Dentry bitmap is not enough to detect incorrect dentries. So this patch also checks the namelen value of a dentry. Signed-off-by: Gong Chen Signed-off-by: Sheng Yong Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 5411d6667781f..e2ff0eb16f89c 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -807,7 +807,8 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, /* check memory boundary before moving forward */ bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len)); - if (unlikely(bit_pos > d->max)) { + if (unlikely(bit_pos > d->max || + le16_to_cpu(de->name_len) > F2FS_NAME_LEN)) { 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)); -- 2.25.1