From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1YrmCu-0005J7-0D for mharc-grub-devel@gnu.org; Mon, 11 May 2015 07:49:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrmCq-0005Gl-Hy for grub-devel@gnu.org; Mon, 11 May 2015 07:49:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrmCn-00078X-Bd for grub-devel@gnu.org; Mon, 11 May 2015 07:49:08 -0400 Received: from mail-lb0-x22e.google.com ([2a00:1450:4010:c04::22e]:34157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrmCn-00078R-40 for grub-devel@gnu.org; Mon, 11 May 2015 07:49:05 -0400 Received: by lbcga7 with SMTP id ga7so91945553lbc.1 for ; Mon, 11 May 2015 04:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=D2K4+cT/7kOozGz9kk97dCM+8OCEvceKmKhFrOkEdKg=; b=d7NR1bj5X85rzR6e4yHTd+Uxz8GjIrKhlj/PZn/Q38Kh3EfOlrSpm0TD+lkPQmrD3l smikYoDGGU5xV2/f/YCAcGNQajqz0GU8DuTIaMkyb2Ib7yAi9Cd7umJ1MIk14fHw5fbK +hSkIPh8pF8tUYYrn2VywDNV3V1INxWurPjvE0y/NFY4+Z7vG0mOmWHEqWbNGUbRamca 0M3f0o19Bvm4uI0fAg/TpPxmK8mueWoL3cNJrUVR+5i4awnZ3KYuU8ASFUYF64EcQemJ 5E6CB+h3mOkh+X95tVYcYnFUlhzPhH1ZtGpd2rWidiILRyEOJe5xubbhLJ/tI17dk9Fs 9inQ== X-Received: by 10.112.235.133 with SMTP id um5mr7966297lbc.7.1431344944362; Mon, 11 May 2015 04:49:04 -0700 (PDT) Received: from opensuse.site (ppp91-76-14-38.pppoe.mtu-net.ru. [91.76.14.38]) by mx.google.com with ESMTPSA id xx2sm3001313lbb.13.2015.05.11.04.49.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 04:49:03 -0700 (PDT) Date: Mon, 11 May 2015 14:49:01 +0300 From: Andrei Borzenkov To: Jan Kara Subject: Re: [PATCH 2/4] xfs: Fix termination loop for directory iteration Message-ID: <20150511144901.3184a6c8@opensuse.site> In-Reply-To: <1405351291-24767-3-git-send-email-jack@suse.cz> References: <1405351291-24767-1-git-send-email-jack@suse.cz> <1405351291-24767-3-git-send-email-jack@suse.cz> X-Mailer: Claws Mail 3.11.0 (GTK+ 2.24.27; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22e Cc: grub-devel@gnu.org X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2015 11:49:09 -0000 =D0=92 Mon, 14 Jul 2014 17:21:29 +0200 Jan Kara =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > Directory iteration used wrong position (sizeof wrong structure) for > termination of iteration inside a directory block. Luckily the position > ended up being wrong by just 1 byte and directory entries are larger so > things worked out fine in practice. But fix the problem anyway. >=20 Committed. > Signed-off-by: Jan Kara > --- > grub-core/fs/xfs.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) >=20 > diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c > index a2fc942707c1..ef3bc787e968 100644 > --- a/grub-core/fs/xfs.c > +++ b/grub-core/fs/xfs.c > @@ -608,8 +608,7 @@ grub_xfs_iterate_dir (grub_fshelp_node_t dir, > - grub_be_to_cpu32 (tail->leaf_stale)); > =20 > /* Iterate over all entries within this block. */ > - while (pos < (dirblk_size > - - (int) sizeof (struct grub_xfs_dir2_entry))) > + while (pos < tail_start) > { > struct grub_xfs_dir2_entry *direntry; > grub_uint8_t *freetag;