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

Commit 78802011 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

inet: frags: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Stefan Schmidt <stefan@osg.samsung.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Cc: Florian Westphal <fw@strlen.de>
Cc: linux-wpan@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: netfilter-devel@vger.kernel.org
Cc: coreteam@netfilter.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: Stefan Schmidt <stefan@osg.samsung.com> # for ieee802154
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59f379f9

include/net/inet_frag.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct inet_frags { 
	void			(*constructor)(struct inet_frag_queue *q,

					       const void *arg);

	void			(*destructor)(struct inet_frag_queue *);

	void			(*frag_expire)(unsigned long data);

	void			(*frag_expire)(struct timer_list *t);

	struct kmem_cache	*frags_cachep;

	const char		*frags_cache_name;

};

net/ieee802154/6lowpan/reassembly.c

+3 −2
Original line number Diff line number Diff line
@@ -80,12 +80,13 @@ static void lowpan_frag_init(struct inet_frag_queue *q, const void *a) 
	fq->daddr = *arg->dst;

}



static void lowpan_frag_expire(unsigned long data)

static void lowpan_frag_expire(struct timer_list *t)

{

	struct inet_frag_queue *frag = from_timer(frag, t, timer);

	struct frag_queue *fq;

	struct net *net;



	fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);

	fq = container_of(frag, struct frag_queue, q);

	net = container_of(fq->q.net, struct net, ieee802154_lowpan.frags);



	spin_lock(&fq->q.lock);

net/ipv4/inet_fragment.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ inet_evict_bucket(struct inet_frags *f, struct inet_frag_bucket *hb) 
	spin_unlock(&hb->chain_lock);



	hlist_for_each_entry_safe(fq, n, &expired, list_evictor)

		f->frag_expire((unsigned long) fq);

		f->frag_expire(&fq->timer);



	return evicted;

}
@@ -366,7 +366,7 @@ static struct inet_frag_queue *inet_frag_alloc(struct netns_frags *nf, 
	f->constructor(q, arg);

	add_frag_mem_limit(nf, f->qsize);



	setup_timer(&q->timer, f->frag_expire, (unsigned long)q);

	timer_setup(&q->timer, f->frag_expire, 0);

	spin_lock_init(&q->lock);

	refcount_set(&q->refcnt, 1);

net/ipv4/ip_fragment.c

+3 −2
Original line number Diff line number Diff line
@@ -190,12 +190,13 @@ static bool frag_expire_skip_icmp(u32 user) 
/*

 * Oops, a fragment queue timed out.  Kill it and send an ICMP reply.

 */

static void ip_expire(unsigned long arg)

static void ip_expire(struct timer_list *t)

{

	struct inet_frag_queue *frag = from_timer(frag, t, timer);

	struct ipq *qp;

	struct net *net;



	qp = container_of((struct inet_frag_queue *) arg, struct ipq, q);

	qp = container_of(frag, struct ipq, q);

	net = container_of(qp->q.net, struct net, ipv4.frags);



	rcu_read_lock();

net/ipv6/netfilter/nf_conntrack_reasm.c

+3 −2
Original line number Diff line number Diff line
@@ -169,12 +169,13 @@ static unsigned int nf_hashfn(const struct inet_frag_queue *q) 
	return nf_hash_frag(nq->id, &nq->saddr, &nq->daddr);

}



static void nf_ct_frag6_expire(unsigned long data)

static void nf_ct_frag6_expire(struct timer_list *t)

{

	struct inet_frag_queue *frag = from_timer(frag, t, timer);

	struct frag_queue *fq;

	struct net *net;



	fq = container_of((struct inet_frag_queue *)data, struct frag_queue, q);

	fq = container_of(frag, struct frag_queue, q);

	net = container_of(fq->q.net, struct net, nf_frag.frags);



	ip6_expire_frag_queue(net, fq, &nf_frags);