Received: from list by lists.gnu.org with archive (Exim 4.71) id 1cf0CX-0007uG-AP for mharc-grub-devel@gnu.org; Sat, 18 Feb 2017 03:17:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cf0CU-0007tr-FB for grub-devel@gnu.org; Sat, 18 Feb 2017 03:17:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cf0CQ-0006li-F7 for grub-devel@gnu.org; Sat, 18 Feb 2017 03:17:02 -0500 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:33012) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cf0CQ-0006km-6r; Sat, 18 Feb 2017 03:16:58 -0500 Received: by mail-lf0-x244.google.com with SMTP id x1so5334322lff.0; Sat, 18 Feb 2017 00:16:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JjmDyDey5GIGlgfPg2zAJSSv3tsXduDmaLCCAewBvJs=; b=qYT+Hryt0Z4h+JlpNNxl6B13rZB1fNyNW6XRjvgMi+hykQRTcALvBG4IS0HxM4nJyV uD7TZxlPX81GPF6b8cBOfVwk6qm7SubFQRkrdjAhfWs1G4CJwjOolqyKlIGcQes8rJEv 6mW7eZZF4Ii49WeHzimp1nHMfBZPAdQ8FqtPg0bt3mhQZFt0z+2x4UFExFY8QCRWJ4fB FjKrlqBEEfsSiPrFRYvpwnsc8M8ZhrkliXAIwb+Z4vdl4bDnf/RJV5HgFU7ovljh7/Sx 69jSuhwIm5WoBJroPhux4/r1Nlh+4YNE9WhVUoJ1xwwolIVGUDQYpvqddr2xAjrpIaqM MvwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JjmDyDey5GIGlgfPg2zAJSSv3tsXduDmaLCCAewBvJs=; b=hJhIPSERqVNoiJPQNpiKuFudNfeUOa/2MfFR9Sb8s3VuzNDHOadvRdDBuK3CMjVZjk Tx9WmXPsA+LqH8XOsHaaVibjBGYy5cR0FpvaE2JK90O+DgrcZ2fzAtIaRRSu4JZ4bOqZ 9zfODtAHkrRTj5jIUvErIN8NKN8m1Ug8adweQg0LD57nHBxj7odKjCoQyZsXEz2LVFIQ peg/VyPqoLecmg8lSiiWFfG0buguxkm+jBIBdRoKZ+G1o5FfvcuD9W11hyFvhucK7ekF NwzokJQnnCHd6gqoXuCJZbU0lggs/qF1ERQxLVTreSGdB26pR2XqCMv7nrSQNtFfCn8C plWA== X-Gm-Message-State: AMke39k7HY/+fV7pmR50TGeKWL4LFM+K3LX1BrDTDxkFn3O4C7e10PvBzmku3tub+RcIxQ== X-Received: by 10.25.216.156 with SMTP id r28mr2926717lfi.28.1487405816821; Sat, 18 Feb 2017 00:16:56 -0800 (PST) Received: from localhost.localdomain (ppp109-252-90-129.pppoe.spdop.ru. [109.252.90.129]) by smtp.gmail.com with ESMTPSA id r198sm1970200lfe.53.2017.02.18.00.16.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Feb 2017 00:16:55 -0800 (PST) From: Andrei Borzenkov To: grub-devel@gnu.org Cc: carlo@endlessm.com, bug-grub@gnu.org Subject: [PATCH] squash4: fix handling of fragments and sparse files Date: Sat, 18 Feb 2017 11:16:43 +0300 Message-Id: <1487405803-2360-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <9b1cfa75-4908-a49f-6186-981ea98ed115@gmail.com> References: <9b1cfa75-4908-a49f-6186-981ea98ed115@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::244 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Feb 2017 08:17:03 -0000 1. Do not assume block list and fragment are mutually exclusive. Squash can pack file tail as fragment (unless -no-fragments is specified); so check read offset and read either from block list or from fragments as appropriate. 2. Support sparse files with zero blocks. 3. Fix fragment read - frag.offset is absolute fragment position, not offset relative to ino.chunk. Reported and tested by Carlo Caione --- @Vladimir: we need regression tests for both of these cases. We could real small files only by accident - block list was zero, so it appeared to work. @Carlo, please test. I'm surprised it worked for you even without fragments as your file is sparse and grub immediately choked on the first zero block. grub-core/fs/squash4.c | 55 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c index b97b344..deee71a 100644 --- a/grub-core/fs/squash4.c +++ b/grub-core/fs/squash4.c @@ -823,7 +823,12 @@ direct_read (struct grub_squash_data *data, curread = data->blksz - boff; if (curread > len) curread = len; - if (!(ino->block_sizes[i] + if (!ino->block_sizes[i]) + { + /* Sparse block */ + grub_memset (buf, '\0', curread); + } + else if (!(ino->block_sizes[i] & grub_cpu_to_le32_compile_time (SQUASH_BLOCK_UNCOMPRESSED))) { char *block; @@ -873,36 +878,57 @@ direct_read (struct grub_squash_data *data, static grub_ssize_t -grub_squash_read_data (struct grub_squash_data *data, - struct grub_squash_cache_inode *ino, - grub_off_t off, char *buf, grub_size_t len) +grub_squash_read (grub_file_t file, char *buf, grub_size_t len) { + struct grub_squash_data *data = file->data; + struct grub_squash_cache_inode *ino = &data->ino; + grub_off_t off = file->offset; grub_err_t err; grub_uint64_t a = 0, b; grub_uint32_t fragment = 0; int compressed = 0; struct grub_squash_frag_desc frag; + grub_off_t blk_len; + grub_uint64_t mask = grub_le_to_cpu32 (data->sb.block_size) - 1; + grub_size_t orig_len = len; switch (ino->ino.type) { case grub_cpu_to_le16_compile_time (SQUASH_TYPE_LONG_REGULAR): - a = grub_le_to_cpu64 (ino->ino.long_file.chunk); fragment = grub_le_to_cpu32 (ino->ino.long_file.fragment); break; case grub_cpu_to_le16_compile_time (SQUASH_TYPE_REGULAR): - a = grub_le_to_cpu32 (ino->ino.file.chunk); fragment = grub_le_to_cpu32 (ino->ino.file.fragment); break; } - if (fragment == 0xffffffff) - return direct_read (data, ino, off, buf, len); + /* Squash may pack file tail as fragment. So read initial part directly and + get tail from fragments */ + blk_len = fragment == 0xffffffff ? file->size : file->size & ~mask; + if (off < blk_len) + { + grub_size_t read_len = blk_len - off; + grub_ssize_t res; + + if (read_len > len) + read_len = len; + res = direct_read (data, ino, off, buf, read_len); + if ((grub_size_t) res != read_len) + return -1; /* FIXME: is short read possible here? */ + len -= read_len; + if (!len) + return read_len; + buf += read_len; + off = 0; + } + else + off -= blk_len; err = read_chunk (data, &frag, sizeof (frag), data->fragments, sizeof (frag) * fragment); if (err) return -1; - a += grub_le_to_cpu64 (frag.offset); + a = grub_le_to_cpu64 (frag.offset); compressed = !(frag.size & grub_cpu_to_le32_compile_time (SQUASH_BLOCK_UNCOMPRESSED)); if (ino->ino.type == grub_cpu_to_le16_compile_time (SQUASH_TYPE_LONG_REGULAR)) b = grub_le_to_cpu32 (ino->ino.long_file.offset) + off; @@ -943,16 +969,7 @@ grub_squash_read_data (struct grub_squash_data *data, if (err) return -1; } - return len; -} - -static grub_ssize_t -grub_squash_read (grub_file_t file, char *buf, grub_size_t len) -{ - struct grub_squash_data *data = file->data; - - return grub_squash_read_data (data, &data->ino, - file->offset, buf, len); + return orig_len; } static grub_err_t -- tg: (2fb8cd2..) u/squash-tail-fragment (depends on: master)