diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-07-08 17:08:34 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2022-08-19 18:47:52 +0200 |
| commit | ce3a783daaa9b8f50d71cb3ac108e39002358a1e (patch) | |
| tree | 64ba6be9882250421f2aec5a6bbae56f043157c2 | |
| parent | 7667b84cc34707c28ca0db8d24f046ec34e8c25d (diff) | |
Fix: libfstree: actually use a full 32 bit hard link counter
The squashfs on-disk format uses 32 bit link counters, but the fstree
used 16 bit ones. Because the link count also includes child nodes,
this artificially limited the number of entries in a directory to ~64k
files.
This patch removes the limit by switching libfstree to 32 bit counters.
Reported-by: Marvin Renich <mrvn@renich.org>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | include/fstree.h | 2 | ||||
| -rw-r--r-- | lib/fstree/hardlink.c | 2 | ||||
| -rw-r--r-- | lib/fstree/mknode.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/fstree.h b/include/fstree.h index 5bdfc7a..b3ecddb 100644 --- a/include/fstree.h +++ b/include/fstree.h @@ -89,8 +89,8 @@ struct tree_node_t { sqfs_u32 gid; sqfs_u32 inode_num; sqfs_u32 mod_time; + sqfs_u32 link_count; sqfs_u16 mode; - sqfs_u16 link_count; /* SquashFS inode refernce number. 32 bit offset of the meta data block start (relative to inode table start), shifted left by 16 diff --git a/lib/fstree/hardlink.c b/lib/fstree/hardlink.c index 11ab566..f45acf7 100644 --- a/lib/fstree/hardlink.c +++ b/lib/fstree/hardlink.c @@ -62,7 +62,7 @@ int fstree_resolve_hard_link(fstree_t *fs, tree_node_t *node) return -1; } - if (node->link_count == 0x0FFFF) { + if (node->link_count == 0xFFFFFFFF) { errno = EMLINK; return -1; } diff --git a/lib/fstree/mknode.c b/lib/fstree/mknode.c index f836c67..e0ab5b8 100644 --- a/lib/fstree/mknode.c +++ b/lib/fstree/mknode.c @@ -75,7 +75,7 @@ tree_node_t *fstree_mknode(tree_node_t *parent, const char *name, } if (parent != NULL) { - if (parent->link_count == 0x0FFFF) { + if (parent->link_count == 0xFFFFFFFF) { free(n); errno = EMLINK; return NULL; |