From patchwork Fri Nov 8 20:34:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 178952 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp3244175ilf; Fri, 8 Nov 2019 12:35:13 -0800 (PST) X-Google-Smtp-Source: APXvYqxXx8jW5ZfQRQjTBYS6FnvOvFlYQuf+YeAt2LWwmcZ5a2tvh0wXXVycwwAzWSWFaSJEPcnY X-Received: by 2002:a17:906:4e99:: with SMTP id v25mr10856242eju.106.1573245313013; Fri, 08 Nov 2019 12:35:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573245313; cv=none; d=google.com; s=arc-20160816; b=VhBFgyXncrSA4daWtmq7GuyojcWiBP0gNlvh8lN9G1T5VoMh4frb7kJ3gw+cqFEwXS SKE8hKxdeT4HmGLz7/6Y0pgOCQCo7baVzJuqS/oBpJC97HyPp3Uc6slsYXVIyuh/j0Z+ M4C2lka7CzJLrzbsRn9F3s635Nn777vXKppKqIC38npBBtNlp9btomIhvTy0MYMN4oR8 YG39nKmuXRM4D26xIonDvNElDqpdYuXT44vIE+iPiQhImWac4XqjcHoGbs6YAsgpeu4I Sm6LwOCtM1fVfUFAdO5OFqNQUfw5esyfrFQnbmEtyBJf0hl2cMHF+LvA93yoyryssNHu x6QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=kw9kdMc8AybmlWpyS8fpLeKJ6ctgM1+Isx9piO6Aetw=; b=oRAicu1w+Fzr24jNp7GQ2mfIG6nNlaxdptibs/1CcUMMHKY0ixutyl/ps7pnWPh5Zf 5bq1JyLPhJVTFRd5/ZxNYhKXBC6nhsvOzzo5b3SEzWABpii/88GFhSFG41joazHWGPWV UPbWgRjpMZhqZSHMrwTjU/M3D0WXIKXfvx9DzUhYl1o8xRzuVjhrbjpbVrG0LR1RqORa mklTwpT9EYMYfpn05E+pKiCRqZmGDVVGSfXy/65GNy6nabSa0k59UYQcbxm5JXO/OvSG BberaU/JJ4Yxi9oe+4OlB49xZ7UPVy7vjDk/1Q9y4KLKYvOKTwZKbStkhRk9WzofKvRC 3cQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 v13si6323573edb.164.2019.11.08.12.35.12; Fri, 08 Nov 2019 12:35:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731238AbfKHUfM (ORCPT + 14 others); Fri, 8 Nov 2019 15:35:12 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:52165 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727477AbfKHUfL (ORCPT ); Fri, 8 Nov 2019 15:35:11 -0500 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MUXd0-1iKLFU3ITg-00QQen; Fri, 08 Nov 2019 21:35:00 +0100 From: Arnd Bergmann To: y2038@lists.linaro.org, John Stultz , Thomas Gleixner Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , stable@vger.kernel.org, Deepa Dinamani , linux-alpha@vger.kernel.org, netdev@vger.kernel.org, Stephen Boyd Subject: [PATCH 1/8] y2038: timex: remove incorrect time_t truncation Date: Fri, 8 Nov 2019 21:34:24 +0100 Message-Id: <20191108203435.112759-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20191108203435.112759-1-arnd@arndb.de> References: <20191108203435.112759-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:dsvYf++PaRS643RBIcfftXOiikOLND2cOaNKY9DSf4lXSBk9638 lhMQnUQ5oC+UdORdW39GRI2YOYmmzkdt2K8YdgnKGU+Q1xAfY/croquox+EBMHjxSXARGT9 0KoXD79AZobQRGcB4BAfLqfv+dMyxMf9KaFtVcRIAA16T+1NEtuZVuDeIlASU8CyEkGCHNx gAYJo1aZa8zydstxki2/w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:1nRjZ/tmDjg=:emR5zWF51M5/vEo+98Qgj5 lnbGKVBN8OwOj2FSuvwsPCgcN6LedIvlNOmNcBKcifHK40VgpKjAFw2tfBI9Pb9lOCisZHMlQ UgYJBlUEX2GrQSQBuRRgLPsrsEFg8nAt5dl0UdiO2vrCaYoHrs3ssjTNh77iLW3qkjUfcPA/r TLt2R1Ir5LhoMlH5kH9/p7N8FndtLd3Y3wyDbRThOuG7NzJp5DEiHgENEHoLEvpS4YW/kZSWM 2R0R1JiGtePuEDlkNZQnnRvAem3cCKuFMhbk5lEvSQDO5xWR+rV1nnyq1taJX9Thu5smjAbjP NiJLOb9M+SBxTVhQgzorOSfX7GDqlIZE6LLW2eRc/v7vNTLLWys2+qfw2zZLBLZtdQxMf9XRo UNKNJR3sXpJnqnQJywDVKLKrnS6/+gv2+VL/xoQNcBoGDnZbjm2EKnxJVuZJ1MqSb4h8bpdD4 jVoo0Q3Jia5qgDYIJx4cqCmXe8SvOyVWNlI5xNnZSMQDVJwk3C+G9xeu4wGC6Y70VEI+Jq0uG my9rYqeWWl/kYJKkQtupze2O70ykbmjRDmCCwcf0RJdp/bBkDWg96ROBzcZiPjuHi9yNkF8z8 664Js3Dn+0KQ22oAb7M58v9laXjw1l1T0VxaaMLE/b3P6tydF0ciIRrcrLuJwqrRv+w6h6gme GUnRujq4IU2xuU91uKfsvlGrbIcXJOOKhxgdkl4AZyUcb6TnYO9IIxlslvmpXVV+PSw6B2hXQ DcSLQDJmcx9Qy66IRjuTUQ3HlGodY38IH5p3onsw70wnIIEZ01F+I9xFf+q4tZhwQ78OesHYu m6wUEUrXwZ3xXgMfnYU8MPbmDMYVB5muevfSfy5ckxLrsP0w8XZ0rOPRQxffJLajGaSxb5YF6 by1mEgUmD5heT8jjdxbQ== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org A cast to 'time_t' was accidentally left in place during the conversion of __do_adjtimex() to 64-bit timestamps, so the resulting value is incorrectly truncated. Remove the cast so the 64-bit time gets propagated correctly. Cc: stable@vger.kernel.org Fixes: ead25417f82e ("timex: use __kernel_timex internally") Signed-off-by: Arnd Bergmann --- kernel/time/ntp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0 Acked-by: Deepa Dinamani diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 65eb796610dc..069ca78fb0bf 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -771,7 +771,7 @@ int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts, /* fill PPS status fields */ pps_fill_timex(txc); - txc->time.tv_sec = (time_t)ts->tv_sec; + txc->time.tv_sec = ts->tv_sec; txc->time.tv_usec = ts->tv_nsec; if (!(time_status & STA_NANO)) txc->time.tv_usec = ts->tv_nsec / NSEC_PER_USEC;