Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
Squashfs: Valid filesystems are flagged as bad by the corrupted fs patch
+4
-17
+4
-17
fs/squashfs/block.c
+4
-17
fs/squashfs/block.c
···
184
184
offset = 0;
185
185
}
186
186
187
-
if (msblk->stream.avail_out == 0) {
188
-
if (page == pages) {
189
-
ERROR("zlib_inflate tried to "
190
-
"decompress too much data, "
191
-
"expected %d bytes. Zlib "
192
-
"data probably corrupt\n",
193
-
srclength);
194
-
goto release_mutex;
195
-
}
187
+
if (msblk->stream.avail_out == 0 && page < pages) {
196
188
msblk->stream.next_out = buffer[page++];
197
189
msblk->stream.avail_out = PAGE_CACHE_SIZE;
198
190
}
···
201
209
zlib_init = 1;
202
210
}
203
211
204
-
zlib_err = zlib_inflate(&msblk->stream, Z_NO_FLUSH);
212
+
zlib_err = zlib_inflate(&msblk->stream, Z_SYNC_FLUSH);
205
213
206
214
if (msblk->stream.avail_in == 0 && k < b)
207
215
put_bh(bh[k++]);
208
216
} while (zlib_err == Z_OK);
209
217
210
218
if (zlib_err != Z_STREAM_END) {
211
-
ERROR("zlib_inflate returned unexpected result"
212
-
" 0x%x, srclength %d, avail_in %d,"
213
-
" avail_out %d\n", zlib_err, srclength,
214
-
msblk->stream.avail_in,
215
-
msblk->stream.avail_out);
219
+
ERROR("zlib_inflate error, data probably corrupt\n");
216
220
goto release_mutex;
217
221
}
218
222
219
223
zlib_err = zlib_inflateEnd(&msblk->stream);
220
224
if (zlib_err != Z_OK) {
221
-
ERROR("zlib_inflateEnd returned unexpected result 0x%x,"
222
-
" srclength %d\n", zlib_err, srclength);
225
+
ERROR("zlib_inflate error, data probably corrupt\n");
223
226
goto release_mutex;
224
227
}
225
228
length = msblk->stream.total_out;