Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1216382 authored by Xi Wang's avatar Xi Wang Committed by Pablo Neira Ayuso
Browse files

netfilter: ctnetlink: fix timeout calculation 



The sanity check (timeout < 0) never works; the dividend is unsigned
and so is the division, which should have been a signed division.

	long timeout = (ct->timeout.expires - jiffies) / HZ;
	if (timeout < 0)
		timeout = 0;

This patch converts the time values to signed for the division.

Signed-off-by: default avatarXi Wang <xi.wang@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 52793dbe

net/netfilter/nf_conntrack_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ nla_put_failure: 
static inline int

ctnetlink_dump_timeout(struct sk_buff *skb, const struct nf_conn *ct)

{

	long timeout = (ct->timeout.expires - jiffies) / HZ;

	long timeout = ((long)ct->timeout.expires - (long)jiffies) / HZ;



	if (timeout < 0)

		timeout = 0;
@@ -1641,7 +1641,7 @@ ctnetlink_exp_dump_expect(struct sk_buff *skb, 
			  const struct nf_conntrack_expect *exp)

{

	struct nf_conn *master = exp->master;

	long timeout = (exp->timeout.expires - jiffies) / HZ;

	long timeout = ((long)exp->timeout.expires - (long)jiffies) / HZ;

	struct nf_conn_help *help;



	if (timeout < 0)