rpm/squashfs
SHA256
1
0
Fork 0
forked from pool/squashfs
Code Pull Requests Activity
b0f0d19b70
squashfs/squashfs-64k.patch

25 lines
990 B
Diff
Raw Normal View History

Accepting request 234303 from home:duwe:branches:filesystems - update to 4.3: - unsquashfs: add checks for corrupted data in opendir functions - unsquashfs: completely empty filesystems incorrectly generate an error - unsquashfs: fix open file limit - mksquashfs: Use linked list to store directory entries rather - mksquashfs: Remove qsort and add a bottom up linked list merge sort - mksquashfs: optimise lookup_inode2() for dirs - pseudo: fix handling of modify pseudo files - pseudo: fix handling of directory pseudo files - xattr: Fix ERROR() so that it is synchronised with the progress bar - mksquashfs/sort: Fix INFO() so that it is synced with the progress bar - mksquashfs: Add -progress to force progress bar when using -info - error.h: consolidate the various error macros into one header file - mksquashfs: fix stack overflow in write_fragment_table() - mksquashfs: move list allocation from off the stack - unsquashfs: fix oversight in directory permission setting - mksquashfs: dynamically allocate recovery_file - mksquashfs: dynamically allocate buffer in subpathname() - mksquashfs: dynamically allocate buffer in pathname() - unsquashfs: fix CVE-2012-4024 - unsquashfs: fix CVE-2012-4025 - mksquashfs: fix potential stack overflow in get_component() - mksquashfs: add parse_number() helper for numeric command line options - mksquasfs: check return value of fstat() in reader_read_file() - mksquashfs: dynamically allocate filename in old_add_exclude() - unsquashfs: dynamically allocate pathname in dir_scan() - unsquashfs: dynamically allocate pathname in pre_scan() - sort: dynamically allocate filename in add_sort_list() - mksquashfs: fix dir_scan() exit if lstat of source directory fails - pseudo: fix memory leak in read_pseudo_def() if exec_file() fails OBS-URL: https://build.opensuse.org/request/show/234303 OBS-URL: https://build.opensuse.org/package/show/filesystems/squashfs?expand=0&rev=18
2014-05-16 15:18:31 +02:00
--- squashfs4.3/squashfs-tools/mksquashfs.c.orig 2014-05-13 00:18:20.000000000 +0200
+++ squashfs4.3/squashfs-tools/mksquashfs.c 2014-05-16 14:59:30.802144932 +0200
@@ -4674,9 +4674,9 @@ void write_filesystem_tables(struct squa
SQUASHFS_INSWAP_SUPER_BLOCK(sBlk);
write_destination(fd, SQUASHFS_START, sizeof(*sBlk), sBlk);
Accepting request 90070 from home:k0da:ppc - The ppc64 kernel uses a page size of 64kB but mksquashfs only pads to a 4kB boundary. When we loopback mount a squashfs file that isn't 64kB aligned and access the last sector of the associated loopback device we see a stream of errors. Disk partitioning tools seem to like accessing the last 512 bytes of partitions. This should fix warnings seen during starting installation on ppc64 and IA64 OBS-URL: https://build.opensuse.org/request/show/90070 OBS-URL: https://build.opensuse.org/package/show/filesystems/squashfs?expand=0&rev=11
2011-11-04 07:38:10 +01:00
- if(!nopad && (i = bytes & (4096 - 1))) {
- char temp[4096] = {0};
- write_destination(fd, bytes, 4096 - i, temp);
+ if(!nopad && (i = bytes & (65536 - 1))) {
+ char temp[65536] = {0};
+ write_destination(fd, bytes, 65536 - i, temp);
}
close(fd);
Accepting request 234303 from home:duwe:branches:filesystems - update to 4.3: - unsquashfs: add checks for corrupted data in opendir functions - unsquashfs: completely empty filesystems incorrectly generate an error - unsquashfs: fix open file limit - mksquashfs: Use linked list to store directory entries rather - mksquashfs: Remove qsort and add a bottom up linked list merge sort - mksquashfs: optimise lookup_inode2() for dirs - pseudo: fix handling of modify pseudo files - pseudo: fix handling of directory pseudo files - xattr: Fix ERROR() so that it is synchronised with the progress bar - mksquashfs/sort: Fix INFO() so that it is synced with the progress bar - mksquashfs: Add -progress to force progress bar when using -info - error.h: consolidate the various error macros into one header file - mksquashfs: fix stack overflow in write_fragment_table() - mksquashfs: move list allocation from off the stack - unsquashfs: fix oversight in directory permission setting - mksquashfs: dynamically allocate recovery_file - mksquashfs: dynamically allocate buffer in subpathname() - mksquashfs: dynamically allocate buffer in pathname() - unsquashfs: fix CVE-2012-4024 - unsquashfs: fix CVE-2012-4025 - mksquashfs: fix potential stack overflow in get_component() - mksquashfs: add parse_number() helper for numeric command line options - mksquasfs: check return value of fstat() in reader_read_file() - mksquashfs: dynamically allocate filename in old_add_exclude() - unsquashfs: dynamically allocate pathname in dir_scan() - unsquashfs: dynamically allocate pathname in pre_scan() - sort: dynamically allocate filename in add_sort_list() - mksquashfs: fix dir_scan() exit if lstat of source directory fails - pseudo: fix memory leak in read_pseudo_def() if exec_file() fails OBS-URL: https://build.opensuse.org/request/show/234303 OBS-URL: https://build.opensuse.org/package/show/filesystems/squashfs?expand=0&rev=18
2014-05-16 15:18:31 +02:00
@@ -5309,7 +5309,7 @@ printOptions:
ERROR("-force-uid uid\t\tset all file uids to uid\n");
ERROR("-force-gid gid\t\tset all file gids to gid\n");
ERROR("-nopad\t\t\tdo not pad filesystem to a multiple "
- "of 4K\n");
+ "of 64K\n");
ERROR("-keep-as-directory\tif one source directory is "
"specified, create a root\n");
ERROR("\t\t\tdirectory containing that directory, "
Copy Permalink