diff --git a/extract.c b/extract.c
index a0a4929..9ef80b3 100644
--- a/extract.c
+++ b/extract.c
@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
     ulg eb_ucsize;
     uch *eb_ucptr;
     int r;
+    ush method;
 
     if (compr_offset < 4)                /* field is not compressed: */
         return PK_OK;                    /* do nothing and signal OK */
@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
          eb_size <= (compr_offset + EB_CMPRHEADLEN)))
         return IZ_EF_TRUNC;               /* no compressed data! */
 
+    method = makeword(eb + (EB_HEADSIZE + compr_offset));
+    if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
+        return PK_ERR;            /* compressed & uncompressed
+                                   * should match in STORED
+                                   * method */
+
     if (
 #ifdef INT_16BIT
         (((ulg)(extent)eb_ucsize) != eb_ucsize) ||
d><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=e09c04809a93faa21e3ab63d831077c361a4a677'>refs</a><a class='active' href='/guix/log/gnu/build/linux-initrd.scm?showmsg=1'>log</a><a href='/guix/tree/gnu/build/linux-initrd.scm?id=e09c04809a93faa21e3ab63d831077c361a4a677'>tree</a><a href='/guix/commit/gnu/build/linux-initrd.scm?id=e09c04809a93faa21e3ab63d831077c361a4a677'>commit</a><a href='/guix/diff/gnu/build/linux-initrd.scm?id=e09c04809a93faa21e3ab63d831077c361a4a677'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/linux-initrd.scm'>
<input type='hidden' name='id' value='e09c04809a93faa21e3ab63d831077c361a4a677'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=e09c04809a93faa21e3ab63d831077c361a4a677&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=e09c04809a93faa21e3ab63d831077c361a4a677&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/build?id=e09c04809a93faa21e3ab63d831077c361a4a677&amp;showmsg=1'>build</a>/<a href='/guix/log/gnu/build/linux-initrd.scm?id=e09c04809a93faa21e3ab63d831077c361a4a677&amp;showmsg=1'>linux-initrd.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/linux-initrd.scm?id=e09c04809a93faa21e3ab63d831077c361a4a677'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2020-12-15 17:32:10 +0100'>2020-12-15</span></td><td class='logsubject'><a href='/guix/commit/gnu/build/linux-initrd.scm?id=6a060ff27ff68384d7c90076baa36c349fff689d'>store-copy: 'populate-store' can optionally deduplicate files.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Until now deduplication was performed as an additional pass after
copying files, which involve re-traversing all the files that had just
been copied.

* guix/store/deduplication.scm (copy-file/deduplicate): New procedure.
* tests/store-deduplication.scm ("copy-file/deduplicate"): New test.
* guix/build/store-copy.scm (populate-store): Add #:deduplicate?
parameter and honor it.
* tests/gexp.scm ("gexp-&gt;derivation, store copy"): Pass #:deduplicate? #f
to 'populate-store'.
* gnu/build/image.scm (initialize-root-partition): Pass #:deduplicate?
to 'populate-store'.  Pass #:deduplicate? #f to 'register-closure'.
* gnu/build/vm.scm (root-partition-initializer): Likewise.
* gnu/build/install.scm (populate-single-profile-directory): Pass
 #:deduplicate? #f to 'populate-store'.
* gnu/build/linux-initrd.scm (build-initrd): Likewise.
* guix/scripts/pack.scm (self-contained-tarball)[import-module?]: New
procedure.
[build]: Pass it as an argument to 'source-module-closure'.
* guix/scripts/pack.scm (squashfs-image)[build]: Wrap in
'with-extensions'.
* gnu/system/linux-initrd.scm (expression-&gt;initrd)[import-module?]: New
procedure.
[builder]: Pass it to 'source-module-closure'.
* gnu/system/install.scm (cow-store-service-type)[import-module?]: New
procedure.  Pass it to 'source-module-closure'.


</td></tr>
<tr class='logheader'><td><span title='2020-11-21 12:39:14 +0100'>2020-11-21</span></td><td class='logsubject'><a href='/guix/commit/gnu/build/linux-initrd.scm?id=2200bb214690ebc78b9fa42887ac9dfb8035bd4f'>linux-initrd: Remove unnecessary timestamp reset phase.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/build/linux-initrd.scm (write-cpio-archive): Mention timestamps in
docstring.
(build-initrd): Remove unnecessary timestamp reset phase.


</td></tr>