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=-9.8 required=3.0 tests=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 67F28C76186 for ; Mon, 29 Jul 2019 20:00:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 324B52054F for ; Mon, 29 Jul 2019 20:00:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564430426; bh=WQzSuaMhJ3OkzAaDq0Sz8lpc3FBoiK7kOXSrxmr9KPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YJu5XhKpYRPEiREdIuf8raSt2iNWDPTMp9fIqOcZOUT6aGpcU+z/Ng1OtN9PwRrBA iLTZfkEQWOpQJcLqPTVSr4/KVKnT1uWbcBq9PKiw8/UQet86uJ7ERt2KQb8dL9+xy8 Utk03/Z+hBziHRKk0XUvWYnVhM9bLrleyv8jJ9fs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390778AbfG2Twm (ORCPT ); Mon, 29 Jul 2019 15:52:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:44002 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390861AbfG2TwN (ORCPT ); Mon, 29 Jul 2019 15:52:13 -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 7FE1621655; Mon, 29 Jul 2019 19:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564429933; bh=WQzSuaMhJ3OkzAaDq0Sz8lpc3FBoiK7kOXSrxmr9KPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PLJHjv88F7DZjvUZUH/SfoXEnmVzJmx2jwUhzt5jitzxU7FU7wq+VUpQUZC3D6br0 xid8/kjC4lMHIMn3V9Vafh9X6iMjYHEQMSblLffjN188/Bhg97UVdwRZk2kEwJPPry l2bJ+D70mu5THXoy7ZOjrfkVWK7KExx11VcGlV4U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ocean Chen , Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.2 142/215] f2fs: avoid out-of-range memory access Date: Mon, 29 Jul 2019 21:22:18 +0200 Message-Id: <20190729190804.238870752@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190739.971253303@linuxfoundation.org> References: <20190729190739.971253303@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 [ Upstream commit 56f3ce675103e3fb9e631cfb4131fc768bc23e9a ] blkoff_off might over 512 due to fs corrupt or security vulnerability. That should be checked before being using. Use ENTRIES_IN_SUM to protect invalid value in cur_data_blkoff. Signed-off-by: Ocean Chen Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/segment.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 291f7106537c..ce15fbcd7cff 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3403,6 +3403,11 @@ static int read_compacted_summaries(struct f2fs_sb_info *sbi) seg_i = CURSEG_I(sbi, i); segno = le32_to_cpu(ckpt->cur_data_segno[i]); blk_off = le16_to_cpu(ckpt->cur_data_blkoff[i]); + if (blk_off > ENTRIES_IN_SUM) { + f2fs_bug_on(sbi, 1); + f2fs_put_page(page, 1); + return -EFAULT; + } seg_i->next_segno = segno; reset_curseg(sbi, i, 0); seg_i->alloc_type = ckpt->alloc_type[i]; -- 2.20.1