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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 9A39EC76195 for ; Fri, 19 Jul 2019 04:28:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7484F21851 for ; Fri, 19 Jul 2019 04:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563510503; bh=85WetMsxMRpZcfNMBz29cDCFeMiP1qHlRMMJCarKnCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Y5/smKD/Cml5AK8ewyjwxTv3fx1fCteRxnOB8pUU6CiWM5A87wDe2kNIkZ9THRzm/ 4LA0riMisSYpEwawYc+pLyQF7TSsdCiQvIoOUIaO2oGzhp2lygSlMuz210PwRyLRnr gCuaxMYDkwEK+rrVbNygdYuOVTA5cGhMPbgr7pqg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387551AbfGSE2W (ORCPT ); Fri, 19 Jul 2019 00:28:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:39602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732148AbfGSEG3 (ORCPT ); Fri, 19 Jul 2019 00:06:29 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 18F9D218B8; Fri, 19 Jul 2019 04:06:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509188; bh=85WetMsxMRpZcfNMBz29cDCFeMiP1qHlRMMJCarKnCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KCw7OngrNZ5wDz/yIIqXw3GQoI4ib1fBM7buyIiYaxPBJEiXS7b3AsFuTvtkd1KR7 nXgRE6M+uFRCSKoMAzFqtfTEv05f3enUCQl8s/EyRRu1q7xYG46kl98DD8PnrWtM3q zc85PKPBaMhmFGFVVIDNUJrKQ+Mm7bRaeAj2IbLM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ocean Chen , Chao Yu , Jaegeuk Kim , Sasha Levin , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH AUTOSEL 5.1 116/141] f2fs: avoid out-of-range memory access Date: Fri, 19 Jul 2019 00:02:21 -0400 Message-Id: <20190719040246.15945-116-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719040246.15945-1-sashal@kernel.org> References: <20190719040246.15945-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ocean Chen [ 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 c7ed3022c4e7..798e33720c74 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -3404,6 +3404,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