Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1001530yba; Thu, 4 Apr 2019 02:08:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqzD14edG3ROF+v2QZWbXCCQICoTdx//7S8PtUVXBtki67z2OA0jf36QRcIfALpo3H+9fHGf X-Received: by 2002:a63:4847:: with SMTP id x7mr4700818pgk.233.1554368932321; Thu, 04 Apr 2019 02:08:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554368932; cv=none; d=google.com; s=arc-20160816; b=h96ap8NdWmq7UISA6oRPkewElz4X4xj56aJunQ596Hr3NDu2ArNgtYPBfvyejJReWn 8E75EDGeKCzAgCZsX792pLlfnZQjNHV4Zl9eyLhz+VHCTQ2/vuJsv5TxSBng9vJvvP8h 6lgMbmyeCt+IWrxZQtFUWJEigDjj0/qEc74ufW6mata4uCBPHkw12Lw3sLnPXQs6AQiB d0TfdNZc6N3tIgPWNB00UP0czNwzFuTk50I9zyF4OUVhs/pSIFk0iCv7XTh5U0ftbKLq 0gwD6IGnN9aC6Nd9pIJyLALr1kSmei9Y2vElVf2wSgSX0Zly50P8aCyMJOw3S8E7sGaO 6bxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WUPi7FGTGSVNmOxhjspnLDU4FoBrMJPg/6V2wD7E/Hg=; b=f3Yx+VlqLPID/HQBNIuudcJ+AklkiydrUiavJOIWyyQw0SrZl4ASIj/E74JA90cICk AaumK3H4q0xp2M+hXEzk/qLX0ogJ92OqdjUOqiYzELVihmL9G539HScehHCezWRsdEyu oyJXWEqQ4bOUjMaIEqD8kn50zon2NSxyWcjM+lNUnQYL317JjpfGR5oJ3tVe1smmBrpb yQCEBDIYwjxiWSJEDnnq+HbPDxmTqQOUD1Qp1x7efBt3iMXEF4xkzv/RAqUQL+vP1XOE Oe2+X6A4xK5Z2alicXvQdtbkSPeaG/U7SM+AXvKIOm9R8gBSiqPdwIoVnxU313fBcPSO S/vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VQwUgq+e; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q22si9553029pll.365.2019.04.04.02.08.37; Thu, 04 Apr 2019 02:08:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VQwUgq+e; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732599AbfDDJIC (ORCPT + 99 others); Thu, 4 Apr 2019 05:08:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:46798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731445AbfDDJHz (ORCPT ); Thu, 4 Apr 2019 05:07:55 -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 5341C214AF; Thu, 4 Apr 2019 09:07:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554368874; bh=L03sWGSzCRI33CQfZq6LqjYjqSkFPf6cQEBw6oms8lE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VQwUgq+e83TrI9vU8v+Eetohuc6pnHndy+JQu7y6lCUWuG9Mx/3GlSFXZEBJBEMGU dqCztXhoOAUNWH7g/fzywFwKUQMZjfKPi1eAbhwlMeEy2Zbxiv0lErX0K1pl9D9jEf fMp25Owe5Gqn9J+IBydTy9AZsplxOcVF04RoQkP8= 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 5.0 006/246] f2fs: fix to adapt small inline xattr space in __find_inline_xattr() Date: Thu, 4 Apr 2019 10:45:06 +0200 Message-Id: <20190404084619.453213450@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404084619.236418459@linuxfoundation.org> References: <20190404084619.236418459@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 5.0-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 2c28aba8b2e2a51749fa66e01b68e1cd5b53e022 ] With below testcase, we will fail to find existed xattr entry: 1. mkfs.f2fs -O extra_attr -O flexible_inline_xattr /dev/zram0 2. mount -t f2fs -o inline_xattr_size=1 /dev/zram0 /mnt/f2fs/ 3. touch /mnt/f2fs/file 4. setfattr -n "user.name" -v 0 /mnt/f2fs/file 5. getfattr -n "user.name" /mnt/f2fs/file /mnt/f2fs/file: user.name: No such attribute The reason is for inode which has very small inline xattr size, __find_inline_xattr() will fail to traverse any entry due to first entry may not be loaded from xattr node yet, later, we may skip to check entire xattr datas in __find_xattr(), result in such wrong condition. This patch adds condition to check such case to avoid this issue. Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/xattr.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index 18d5ffbc5e8c..73b92985198b 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c @@ -224,11 +224,11 @@ static struct f2fs_xattr_entry *__find_inline_xattr(struct inode *inode, { struct f2fs_xattr_entry *entry; unsigned int inline_size = inline_xattr_size(inode); + void *max_addr = base_addr + inline_size; list_for_each_xattr(entry, base_addr) { - if ((void *)entry + sizeof(__u32) > base_addr + inline_size || - (void *)XATTR_NEXT_ENTRY(entry) + sizeof(__u32) > - base_addr + inline_size) { + if ((void *)entry + sizeof(__u32) > max_addr || + (void *)XATTR_NEXT_ENTRY(entry) > max_addr) { *last_addr = entry; return NULL; } @@ -239,6 +239,13 @@ static struct f2fs_xattr_entry *__find_inline_xattr(struct inode *inode, if (!memcmp(entry->e_name, name, len)) break; } + + /* inline xattr header or entry across max inline xattr size */ + if (IS_XATTR_LAST_ENTRY(entry) && + (void *)entry + sizeof(__u32) > max_addr) { + *last_addr = entry; + return NULL; + } return entry; } -- 2.19.1