From patchwork Tue Jan 28 14:06:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232680 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=unavailable 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 2407EC2D0DB for ; Tue, 28 Jan 2020 14:14:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF5452468E for ; Tue, 28 Jan 2020 14:14:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220888; bh=8gSogPXNh+Qua/Z7YIKP4oqNfyKKRzwF83tKnY3Hask=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=slH9pYSyZYeJc1e0MiUSiTjO7l4QDzgVBvtXKX7PggWCkNQu3N77n9Dt7pg1qxtym vPFmQ8WFMgGHBo7THMdU6hgF3Hl39KFmcRozWdlYwB33G3VV7urfgiZm5AE4AEnbdi E2OlLDKJFsuGWq+DF6GorZzIoNwXF/ABrAUdhyls= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727099AbgA1OOo (ORCPT ); Tue, 28 Jan 2020 09:14:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:36986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729944AbgA1OOn (ORCPT ); Tue, 28 Jan 2020 09:14:43 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 D56A324688; Tue, 28 Jan 2020 14:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220883; bh=8gSogPXNh+Qua/Z7YIKP4oqNfyKKRzwF83tKnY3Hask=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=szGJavda8irn88H5qGjPQO8Jm86oG6uyKnRwEma6dBK3/E0qDdfCyem1qtxffwer5 iPwJqC7uZlhQUpLl9WpeX08xULBFj9cDC63E4qhrR9AXSruz3uYJ9Z7iIFlNcmDqvY qZupGiZT/js9uAn6djVwMA1CwfLOBEwLA4hIf8kg= 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.4 154/183] net: neigh: use long type to store jiffies delta Date: Tue, 28 Jan 2020 15:06:13 +0100 Message-Id: <20200128135845.142045551@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 af1ecd0e7b070..9849f1f4cf4f7 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1837,8 +1837,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,