From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 022D3C3F68F for ; Mon, 10 Feb 2020 13:30:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C70772082F for ; Mon, 10 Feb 2020 13:30:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581341415; bh=woX0Ydv2qmYJW4v7KrORadE2qzLlsvEvI1gOBcUVQqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ihu0E8oCdtWlyu+3PEp68yFhykUAqtgO34QT5jb6HajzgE3y5OuKdVkgHhxuD+mi5 JOKoQG/hIfJ4eW8gs9H9Db+GP8T2B+OJTzpc53uvj86c3vQMJTVq3jQWmx0NsWdpZd Ghw2RaIbZdo9OGWzNntvUtQzpoHnUplPc9tTuGRc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728306AbgBJNaO (ORCPT ); Mon, 10 Feb 2020 08:30:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:55180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728300AbgBJMgO (ORCPT ); Mon, 10 Feb 2020 07:36:14 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 14C5C20842; Mon, 10 Feb 2020 12:36:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338174; bh=woX0Ydv2qmYJW4v7KrORadE2qzLlsvEvI1gOBcUVQqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NlIePfYgmfr74T9QV+shp+xwCd4y0rmzNIt7ZS0j3sfUCqYNlFZjcOixgyLDgmCCA Z/HwaJg3OLQhTVZO+M+mA4vYhNJCQ31qtpRS0C7U+yW7cdc3HukvHPgpl2XXV6jPR6 c4RhbPoazi92M+LZ0KSjLtkwVjrXihRUrNVkyIL8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , "J. Bruce Fields" Subject: [PATCH 4.19 159/195] nfsd: fix delay timer on 32-bit architectures Date: Mon, 10 Feb 2020 04:33:37 -0800 Message-Id: <20200210122320.846170042@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122305.731206734@linuxfoundation.org> References: <20200210122305.731206734@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 2561c92b12f4f4e386d453556685f75775c0938b upstream. The nfsd4_cb_layout_done() function takes a 'time_t' value, multiplied by NSEC_PER_SEC*2 to get a nanosecond value. This works fine on 64-bit architectures, but on 32-bit, any value over 1 second results in a signed integer overflow with unexpected results. Cast one input to a 64-bit type in order to produce the same result that we have on 64-bit architectures, regarless of the type of nfsd4_lease. Fixes: 6b9b21073d3b ("nfsd: give up on CB_LAYOUTRECALLs after two lease periods") Signed-off-by: Arnd Bergmann Signed-off-by: J. Bruce Fields Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4layouts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -676,7 +676,7 @@ nfsd4_cb_layout_done(struct nfsd4_callba /* Client gets 2 lease periods to return it */ cutoff = ktime_add_ns(task->tk_start, - nn->nfsd4_lease * NSEC_PER_SEC * 2); + (u64)nn->nfsd4_lease * NSEC_PER_SEC * 2); if (ktime_before(now, cutoff)) { rpc_delay(task, HZ/100); /* 10 mili-seconds */