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 0E9AFC33CAF for ; Thu, 16 Jan 2020 23:40:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D17B92072B for ; Thu, 16 Jan 2020 23:40:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579218005; bh=Q38lxsXrd6RMZPU5R2oxnuqAMgrL9i1BFETIT3lzb5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VhWw0Ed7ROc8PvavgBZbnaL6ehlUYypPh3SdGWfuhHjwza+qXLHPvWUzMbmmqtI1b b5YUvgClkr6rEoxtuQG9y4SA7IlxrUSzU9anxjpAVZDiaXsgVSENiiwBVsf/YuhgR/ iBt9e2hS1MyKWl34yjXCdKbm8HcY87VuLa4CrWYA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388879AbgAPXkF (ORCPT ); Thu, 16 Jan 2020 18:40:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:59684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390229AbgAPX1k (ORCPT ); Thu, 16 Jan 2020 18:27:40 -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 9C87020684; Thu, 16 Jan 2020 23:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217260; bh=Q38lxsXrd6RMZPU5R2oxnuqAMgrL9i1BFETIT3lzb5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IxDdSx8Y/USCSdcgzw9vGi25FRU+Hn8FJCBmuFH+zA34tqNbTcB35pKHzb+OeiBXx Fm4H4LNKqxTtzViCCoQk1KvhxBORZ8kNyh/ZFoutbCz6YUDU/zz6Zi37XGuwdCkg51 UdhEqnYNERsB57GZ87ZsabqiDnF1C6aSzONIfVOk= 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 , Ben Hutchings Subject: [PATCH 4.19 10/84] f2fs: check if file namelen exceeds max value Date: Fri, 17 Jan 2020 00:17:44 +0100 Message-Id: <20200116231714.780541022@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sheng Yong commit 720db068634c91553a8e1d9a0fcd8c7050e06d2b upstream. 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: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- fs/f2fs/dir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -808,7 +808,8 @@ int f2fs_fill_dentries(struct dir_contex /* 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(sbi->sb, KERN_WARNING, "%s: corrupted namelen=%d, run fsck to fix.", __func__, le16_to_cpu(de->name_len));