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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 E8DC3C35242 for ; Fri, 24 Jan 2020 10:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF4652087E for ; Fri, 24 Jan 2020 10:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860473; bh=Yd3fRGgv7gDszkQ/Sr+P4Rtty4SbRieQT/aEj8I8Znw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2IWISRqC6oz/Yb2NNmaIXzQVGADbTvjeMZ+zhGo/70qLKGDtZazYCRKygmbr78GaL uYl6NdHWMQ9rmNrrkTh45ZY5F3xfKAPIJ7HR2Ehq447Vm3TlJRDt6SgWZYTSgYQTch 9onT3DFAH9JDTrS7PAP46DGK5X+kWYO3P/Rj5SCo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389434AbgAXKHw (ORCPT ); Fri, 24 Jan 2020 05:07:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:44486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389432AbgAXKHv (ORCPT ); Fri, 24 Jan 2020 05:07:51 -0500 Received: from localhost (unknown [145.15.244.15]) (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 451362087E; Fri, 24 Jan 2020 10:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579860470; bh=Yd3fRGgv7gDszkQ/Sr+P4Rtty4SbRieQT/aEj8I8Znw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZIruzwfDZPQJxVvbEQOLQUaRvblEvgaBcmORA4eZEIANKBrpM1sTPCSvugbXu7iw5 9vCZgQS0ccSQ5vfEYBW7TR7AbmJrEiG1Q46FAH3p07+iPagdSgLmPnLoc+1WP2mphw AtNGS/+/gVkPRZV1vYxcyHxZQybCdiZKffimENDY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 333/343] net: neigh: use long type to store jiffies delta Date: Fri, 24 Jan 2020 10:32:31 +0100 Message-Id: <20200124093003.582704555@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@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: Eric Dumazet [ Upstream commit 9d027e3a83f39b819e908e4e09084277a2e45e95 ] A difference of two unsigned long needs long storage. Fixes: c7fb64db001f ("[NETLINK]: Neighbour table configuration and statistics via rtnetlink") Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/neighbour.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 16ac50b1b9a71..567e431813e59 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1877,8 +1877,8 @@ static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl, goto nla_put_failure; { unsigned long now = jiffies; - unsigned int flush_delta = now - tbl->last_flush; - unsigned int rand_delta = now - tbl->last_rand; + long flush_delta = now - tbl->last_flush; + long rand_delta = now - tbl->last_rand; struct neigh_hash_table *nht; struct ndt_config ndc = { .ndtc_key_len = tbl->key_len, -- 2.20.1