From 0b4b96e6e5e0cd044dbcb89c9ee2d7cf8ea69a20 Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Sun, 9 Jun 2013 01:19:22 +0000 Subject: [PATCH] libstand: Reset the seek pointer in ext2fs as done in UFS. Based on r134760: Reset the seek pointer to 0 when a file is successfully opened, since otherwise the initial seek offset will contain the directory offset of the filesystem block that contained its directory entry. This bug was mostly harmless because typically the directory is less than one filesystem block in size so the offset would be zero. It did however generally break loading a kernel from the (large) kernel compile directory. Also reset the seek pointer when a new inode is opened in read_inode(), though this is not actually necessary now because all callers set it afterwards. PR: 177328 Submitted by: Eric van Gyzen Reviewed by: iedowse MFC after: 5 days --- lib/libstand/ext2fs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libstand/ext2fs.c b/lib/libstand/ext2fs.c index 1bd78e20acb1..e0afb3eddd6d 100644 --- a/lib/libstand/ext2fs.c +++ b/lib/libstand/ext2fs.c @@ -536,6 +536,7 @@ ext2fs_open(const char *upath, struct open_file *f) * Found terminal component. */ error = 0; + fp->f_seekp = 0; out: if (buf) free(buf); @@ -584,6 +585,7 @@ read_inode(ino_t inumber, struct open_file *f) for (level = 0; level < NIADDR; level++) fp->f_blkno[level] = -1; fp->f_buf_blkno = -1; + fp->f_seekp = 0; out: free(buf);