From patchwork Thu Feb 14 11:49:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 158353 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1259314jaa; Thu, 14 Feb 2019 03:49:51 -0800 (PST) X-Google-Smtp-Source: AHgI3IbIAk8DTpT1xFT5800aou91uwOWmg6zVPdlAFz/as3V34k4V/FZ+iZjv7MowKAVLyEsuGRn X-Received: by 2002:a62:e086:: with SMTP id d6mr3575031pfm.247.1550144991865; Thu, 14 Feb 2019 03:49:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550144991; cv=none; d=google.com; s=arc-20160816; b=W9aAwzTbfCZ5yRx/jtVsSjutUhILb1GsTgavLH0sPAcKlLaw1jQncVIHfPHorjZRWB QqwHILC1nVPJmiOHB/uklEzA0CsRJiE3eaiqv4BJQD3fpCu5MNbIrtWmfd4IdiSb/pQC oqaOOK4Kae62XhaLXeVa9oY4ijD1JtOvjNdxRIO+tAR56grKt/JUBaCBD8tFBWRXXRec JJrqa+W69Fa/49QLt1LnHWByrABdnSINdMatbiAyKkg8rJf2ypqH+1E6Tei+pyW8gIuH DyCqMSPmYk8nuzxvUsKtHHUOzh3FX9DdQF8JeGyKU05y0sR2vcYg3TELtiebp4nh3j30 FfJA== 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=iTWi5OixGgIG43/iIaWFTG49dWQDCdAJqTbdgeszEdw=; b=onlV7wrIKuDDASUVzocZNx8hxxgoXfRHUtx1kVEWOLaPJIK9AtBe5L7tSd7P18h04P cE2Uduz3EdeGCnPuXHarShq9F20awbSC2N/IzNQHaT6sXymwtDluw+mLJmBysC4iv9yS lh2DHWdhYcc5595oJ30iKVQR8L+VkyqnofXZq5MYoY+CY9kAmXAn/KOF8aUgJWmDDUYZ mEEkjfpLZ3YNG+FQSDPXzux0LwxS63n3GyLiCzsGLvk8BVv89lSpcVDdaSpG6GOYLG2Y xIMb1kca2e7RamYZAUAAPQq2IdMkDKuR+3QE0Y09RWIi5nLO4k+WmrlfMUUMGp8mavHS A6YQ== 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=tDar0k3s; 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 f14si2059958pgv.262.2019.02.14.03.49.51; Thu, 14 Feb 2019 03:49:51 -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=tDar0k3s; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 094D07C54E; Thu, 14 Feb 2019 11:49:47 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mail.openembedded.org (Postfix) with ESMTP id 93DBE7C61A for ; Thu, 14 Feb 2019 11:49:43 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a62so5965493wmh.4 for ; Thu, 14 Feb 2019 03:49:45 -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=j/oPdpacVkyq+1q0cvZzSUkzgR2XGoFzimPs7DEVssc=; b=tDar0k3s1//WNQouya/DIWoqoVtMHCSk12Uz5yDFES2KgQHB/f6ZwdgBnGBGQJoYLp f5m/G3LAqvkRREL6sxFaCqN07IwBvJZ9/t9nQ5CwMh0qXmGUZjepm3p94NvuMA0lma/x L7Nkuxv8BqVYmPcYT0OMCiwmhuz4KXWFL+utoTQmPCuhmL/FTVgp9juW5zXiSwxGkyHT zr0CaXTtQuR/J9QWRDHJWSUOTF5ZaWbJMTLEwEek31qdRKG7+sNmDxLv0GQUXfDkS/TY 3KIAVymFs+0nKmhi4r50M1OU578doHHRFxyEXER+L8YS1vpRxrKKLfWI6E+FPPjmks4j TPkA== 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=j/oPdpacVkyq+1q0cvZzSUkzgR2XGoFzimPs7DEVssc=; b=LYELUpDAg8ivrvmJ4wSx82gBe5rVlE+7vgXAbhFnVUUTonoil9wB8mdttT2nj2RlaQ ywbdndK5oeQ/1MduuF583ZIlUegI6+Vw6hhZmhpMmd5r+wvfO4X77nIAgHlUliu9kcVV seOhk2XnUd2N2XY2DbTvEnvk5uTLXJ2NmcvxEK9/QnPb4fcSqjsOQfwtRzCShhuZuiX+ b4lnWwOL7k8yGzD7aNvqlOtb975xPV+B6N2QnI/6ciXWiT7QN8MEYZ/0PkuSL2uee5ea BNVWzPp/kCx5zil8Hg//uWG4NOLTyBCFPmukM84/fnplne0U3VF4uSiTkhqAJ9A3TLld bR2w== X-Gm-Message-State: AHQUAubrhM2cIP174FZaRFjc3olyQtljajfBIsJ8C6QiVHzIR25pwJ6p Iy+KXyFpEsO5RQwfGacFKr0+JRybOXA= X-Received: by 2002:a7b:c756:: with SMTP id w22mr2447904wmk.12.1550144983896; Thu, 14 Feb 2019 03:49:43 -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 c186sm3377326wmf.34.2019.02.14.03.49.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 03:49:43 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 14 Feb 2019 11:49:38 +0000 Message-Id: <20190214114938.3044-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH][thud] 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..cffb5362d6d 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.3.bb @@ -6,6 +6,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ file://mkdir_p.patch \ file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ + file://0001-create_inode-fix-copying-large-files.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \