From patchwork Fri Feb 1 13:08:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 157201 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp405101jaa; Fri, 1 Feb 2019 05:08:21 -0800 (PST) X-Google-Smtp-Source: ALg8bN7jqnZIFbYsAEZ2V8zOQdNpJa0GG62g7JLcXwv5+z60c68hGWlFtjrdVOM/jAyhQI1Fe/N3 X-Received: by 2002:a17:902:29a7:: with SMTP id h36mr39956757plb.244.1549026501270; Fri, 01 Feb 2019 05:08:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549026501; cv=none; d=google.com; s=arc-20160816; b=w1yP2pq7gtIytuSInMOb5Fh4gTH8R+zXlNpBMc2+CVbhB/dhBHUq08pcF9UqZYkhRA SWLme76vIQqWLemaETXec8ApBqEhZv+ExUAHfhpce8gPYGIUN/rkHYRewWQP9bp5NVXI za48pDwDCU1hWlQiEzMTkzXOlTqUdf+dkvRRK+vPLgJGznZxOwhY5BnfG5mg21y4MGPR iUQ+CrgYBbeTB84E7A9IEzHwgpn1BDK2av63xD2cxn2Kh2OmaCWIFcBVCIkzLwyOA+iG ZChA6pKJ2e3emm3UtUhWYYb708/IX5/8cVbQ5ManxLkLmJGRMKXol8Pg9VrXaFip7c+D FDjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=mEpzXa1PLfd70xGCHen9M7sMao7F5kGIKAqpRSPH5yY=; b=EdNQstZrKpp83p1YDe4kpa13TVy0gGydCvPZuX0QVw9p/39blkqlQByfb9Hs8Gr6rp Ye3R4OEjHWgliE4viOUYL28LTgWvDVSlHhmv+oszWTgIbcft8aPMSHbWUSAxcmiCCKGT la8m5J9WMPi0bHK9FxkIOoD2LS4MRzVr/y1vTOGDTXrIkM6oU7H9QklSaUQjZwVj/bjp wd4aWr1bywKt74SN+RrVlCC9go9Z4r8p5dze31v2rcym4f3RP6zFOxNKdFH0S4Y+RpR/ rzOuvnyeU4pQqCYcWjw+cfWFN2Ye/qCzeCiMEwF8n58YXYlQk6VO6XZX+DKKAvdAaVBA FSxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=ZZSLoFH4; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a4si7808405pls.262.2019.02.01.05.08.21; Fri, 01 Feb 2019 05:08:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=ZZSLoFH4; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EE5FC7C4B4; Fri, 1 Feb 2019 13:08:18 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id CEDC87C4A7 for ; Fri, 1 Feb 2019 13:08:17 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id q18so6993926wrx.9 for ; Fri, 01 Feb 2019 05:08:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=qXDAMQ5uQGCJMFMVCu36YQWerc770PFFILGUhCjEsAY=; b=ZZSLoFH4q1FjTA8j5UKs72Pu8L40iJ6MGQLbC+197POm/yBhwRzFtsvlkOHACDv4YA 6yxIqTNqsLyma94sFoYYnQXwhryj/GfNkOMMFFxunQsbJVbl4FC9zSdf/JZL9AEux5fc lSfv9VL65+7tmMUxY0aupnpuNrZtbP/AlBAAYDvddRcBWFyx2RUzzIKLHdht0bVam3R8 TQXlCodK/x80pcoMDVurjhtqlO1A1A5BxxL+5Xz7TPAiNwqc8OF50JvWfTFF7Wdqyxro Qnb6sd55mXeMd430FyWq/3jNfZcExRQsJOF2n91ASWuuR4MTEodCdemp9fRCeIk+GSdU ilgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=qXDAMQ5uQGCJMFMVCu36YQWerc770PFFILGUhCjEsAY=; b=KGOPjpsFP4miKNEL5K8K36QPRzCKHMerkxzOTsVMA1EVl671+zCzMh8HmN6izXpfve 7vzKAJcz9esalCaOHhQs9uq0hQKfUwAIMxKaDeKRFpjVT8B6OE0v/jL9bzGymdPF53K0 EnsTBJtKcjufuK2QRZwdtXTaouj5TDMlr3tw/wwv9XkE6Ajzn7S64hfAs0SsMiezxCX0 9Xr8s3k3YsTUIf1jdbekuF/m7ShlyKL1w5BLXBSg0wNvxjvkmhdxgN2Afmb/+YDqOZ0O ctK3tuZkoARIo1irIB0Zm84WvKsunv5FzUGe2cJkdfUGP01ZjAyTsxKwSRHspYlFmujm 3LDQ== X-Gm-Message-State: AJcUukdsbY8vUL9bHyGcimkMyp/jCAygtjXW08SmJhgjt/x4zW7WKgFJ CfJqIO8ROJEKCHHC6KtZ+KHNQVdSNRs= X-Received: by 2002:adf:e608:: with SMTP id p8mr38839026wrm.166.1549026498124; Fri, 01 Feb 2019 05:08:18 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id p4sm6909108wrs.74.2019.02.01.05.08.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Feb 2019 05:08:17 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 1 Feb 2019 13:08:15 +0000 Message-Id: <20190201130815.32379-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH v2] e2fsprogs: fix file system generation with large files X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org When copying files into the file system the file offset was being truncated to a signed 32-bit value, so any files that are larger than 2^31 bytes were the right size, but no content after that point. Signed-off-by: Ross Burton --- ...0001-create_inode-fix-copying-large-files.patch | 50 ++++++++++++++++++++++ .../recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch new file mode 100644 index 00000000000..c89581dce84 --- /dev/null +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-create_inode-fix-copying-large-files.patch @@ -0,0 +1,50 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From 674ab87b8338372338d20e21a350f88b4ff6c7c8 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 1 Feb 2019 10:59:59 +0000 +Subject: [PATCH] create_inode: fix copying large files + +When copying large files into a ext filesystem at mkfs time the copy fails at +2^31 bytes in. There are two problems: + +copy_file_chunk() passes an offset (off_t, 64-bit typically) to +ext2fs_file_lseek() which expects a ext2_off_t (typedef to __u32) so the value +is truncated. Solve by calling ext2fs_file_llseek() which takes a u64 offset +instead. + +try_lseek_copy() rounds the data and hole offsets as found by lseek() to block +boundaries, but the calculation gets truncated to 32-bits. Solve by casting the +32-bit blocksize to off_t to ensure this doesn't happen. + +Signed-off-by: Ross Burton +--- + misc/create_inode.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/misc/create_inode.c b/misc/create_inode.c +index 05aa6363..f106dcda 100644 +--- a/misc/create_inode.c ++++ b/misc/create_inode.c +@@ -438,7 +438,7 @@ static errcode_t copy_file_chunk(ext2_filsys fs, int fd, ext2_file_t e2_file, + ptr += blen; + continue; + } +- err = ext2fs_file_lseek(e2_file, off + bpos, ++ err = ext2fs_file_llseek(e2_file, off + bpos, + EXT2_SEEK_SET, NULL); + if (err) + goto fail; +@@ -481,7 +481,7 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf, + return EXT2_ET_UNIMPLEMENTED; + + data_blk = data & ~(fs->blocksize - 1); +- hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); ++ hole_blk = (hole + (off_t)(fs->blocksize - 1)) & ~(off_t)(fs->blocksize - 1); + err = copy_file_chunk(fs, fd, e2_file, data_blk, hole_blk, buf, + zerobuf); + if (err) +-- +2.11.0 + diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb index ce95dec5fec..720eaff06a3 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb @@ -9,6 +9,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ + file://0001-create_inode-fix-copying-large-files.patch \ file://quiet-debugfs.patch \ "