From patchwork Thu Oct 19 09:55:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 116353 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp294285qgn; Thu, 19 Oct 2017 02:55:47 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QncumFeTKPAWQIZ5xYAvmBHvt0vnY66IFvzIwjoO+/Fn95xA2+ZB2nLhOw05T4zB0XMBaZ X-Received: by 10.99.101.70 with SMTP id z67mr888782pgb.178.1508406947489; Thu, 19 Oct 2017 02:55:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508406947; cv=none; d=google.com; s=arc-20160816; b=S8xZR2+9YqffcMMWKVduQXlUmkhF2YPrMnp1jl5eJnInV4PpfpuQH7JTYFOZvbfEjZ IeXRADQEmMHO4pI0Ui9FmRx3rE5gh4Zue6GDHM9EtjynUQn9wXC2LfWD6KCe+LXdhVRL UL/z4hUhQQn8ttMKA76ZvdWng7BCvTo/qr/q0oGlcWgXs4067TuEJO1DwCpVMXysbTGY IZyHfBCh5bsxsYO5nJM5PDrY8v2BNDXzW/lhLWJezssEShvsUoc1KTReuc782+gobAw1 1XkMrLV9idGZ4yKgKb9di033O4IXmZXXXGG1I6GwB6D/a6jDVEuPrXaMG3REHdWOu+61 tajQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=TG3qJQ8evlM+nFOZDW168ZO+NuZ4x4lkEkCVJqI4PCo=; b=K370DpuypavYXAWyDMXPiragLgJ/LIH62G3XPLRjN7c/SKqslgyksRfdEOpLQ84l4B Vr/cdYRfNEcSnCKIu9opvNgDju0+P/caXri5+1H1iRGqlFs7sDE4fOope56D57GmcGf2 JSxCTJRD21UEd53lPEzVUUU5AxjVV0/6PwMfVp5Ac3l/ov+5wYmBjrc2QCAnxkubTNwz RfX41qMpfi4gwhmUjdVawIueTjwyjjJmXq0Hu0+X617qMZPpOxyWT8KPzf7HrrKrpNKA NT5RToI9OenLpmAi7tQrMWL5+2whmxuvPwhzeQeP9CKIod41W6tl9FX7XHTzMEIVyxnN gjCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e9si9390250pln.708.2017.10.19.02.55.47; Thu, 19 Oct 2017 02:55:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752686AbdJSJzp (ORCPT + 27 others); Thu, 19 Oct 2017 05:55:45 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:54692 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752313AbdJSJzn (ORCPT ); Thu, 19 Oct 2017 05:55:43 -0400 Received: from wuerfel.lan ([46.223.139.202]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lm4OX-1dWKtc2jWT-00Zf3J; Thu, 19 Oct 2017 11:55:37 +0200 From: Arnd Bergmann To: y2038@lists.linaro.org, Andrew Morton Cc: Al Viro , Deepa Dinamani , linux-fsdevel@vger.kernel.org, Arnd Bergmann , Daniel Thompson , Lokesh Vutla , Stafford Horne , linux-kernel@vger.kernel.org Subject: [PATCH] initramfs: use time64_t timestamps Date: Thu, 19 Oct 2017 11:55:27 +0200 Message-Id: <20171019095536.801199-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:luO8qVO8sScfACEAjCA2ny8t4UnHTM8KlojXQUkXHFI3Gtpzyaj XUKIwFQpYvGJlaCA3jiJnQwSX9nKuRWBzBfX9hu/n2XqkxkAO2JO/JnfMK+5qHYICDvzjKz pxh/hswuKI0Asol2tRIn35z7bqVTnfZAVB+POkI+8ivbuCv14Ko1Xvo6MzKFhFpSZpBjVs+ qAZgb+uAVQXA1LXqoTcfg== X-UI-Out-Filterresults: notjunk:1; V01:K0:VQaKpp0uXdo=:/WJjDsmX1vE5+m1QzgR0pG rua4+0roUpOaIOjUewreUu/Gz2DaNQWLnLvOEAIGYVGx9/D5aT+Z2SdQlXnBVCQrLsISR/DcY ykXbCKiW8O1pG/GffMfPEVULBqdkcQk+zuohKlUxmZ9Z7j9HmWaCbPZzxHrzSORQG1wy7YN0o aINDWRPcxrqsUBlVBEgBReiies15SEK+pgK/R3+F+JsCqM+EpECCpPsPDefMSvW4r8nTRQWN8 E72n8XWyEcIrxeNTycJLy2YQIptZmCpJm0nrsximh8ysz60b2c3hU3YoI8oud2OZDkM1mH0mf VrdsUVBEACDt+g7DoW+WqlWhv5UEfQcp35U1J0e7Snnv79oGk3y2Pl0qu+YVIg5MJM25tcJpe KJOuu0zjqMo5coRKW2atr0u+v4dS/hcy68M8sgjQ4xCBdRyr4yQ3O/YMQOTQOwgiVH8H90ypZ eafS1wQhN1fWQrV6YGuL//v1pfabKboVEYrq99bx193qPNS4GlRc408AVEXSnRu4B0UW39Gf6 jcDZ8ceJu+SsAA/S/BCJ4nzLWCi5s+Pdhi2/mRCFIs5Ft51JDFuF7K1eFv+GVJBlBP8WAOCj9 /pi6sMiKslN39JvSyc7NtdzkQnBmq7vgo0CQ6C0GbZDcfLKy8EiSOeEujfsrRgCwFweBTjux7 Vrm6UzrWvs7DvF/1QwiKXGYobn0LNx9jk8uk87tTVLGUouvqdPwRsg0DH/xRu4fck//kR5/wD 77KvSt7uoQJ8U5TUUoi8aV2laTRb+aOUt8lrqw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The cpio format uses a 32-bit number to encode file timestamps, which breaks initramfs support in 2038. This reinterprets the timestamp as unsigned, to give us another 68 years and avoids breaking until 2106. Signed-off-by: Arnd Bergmann --- init/initramfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.9.0 diff --git a/init/initramfs.c b/init/initramfs.c index e64bf7b4c1ca..53aa2d0a53d4 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -108,7 +108,7 @@ static void __init free_hash(void) } } -static long __init do_utime(char *filename, time_t mtime) +static long __init do_utime(char *filename, time64_t mtime) { struct timespec64 t[2]; @@ -124,10 +124,10 @@ static __initdata LIST_HEAD(dir_list); struct dir_entry { struct list_head list; char *name; - time_t mtime; + time64_t mtime; }; -static void __init dir_add(const char *name, time_t mtime) +static void __init dir_add(const char *name, time64_t mtime) { struct dir_entry *de = kmalloc(sizeof(struct dir_entry), GFP_KERNEL); if (!de) @@ -149,7 +149,7 @@ static void __init dir_utime(void) } } -static __initdata time_t mtime; +static __initdata time64_t mtime; /* cpio header parsing */ @@ -176,7 +176,7 @@ static void __init parse_header(char *s) uid = parsed[2]; gid = parsed[3]; nlink = parsed[4]; - mtime = parsed[5]; + mtime = parsed[5]; /* breaks in y2106 */ body_len = parsed[6]; major = parsed[7]; minor = parsed[8];