Skip to content

Commit 8ef522c

Browse files
committed
inet: frags: avoid theoretical race in ip_frag_reinit()
In ip_frag_reinit() we want to move the frag timeout timer into the future. If the timer fires in the meantime we inadvertently scheduled it again, and since the timer assumes a ref on frag_queue we need to acquire one to balance things out. This is technically racy, we should have acquired the reference _before_ we touch the timer, it may fire again before we take the ref. Avoid this entire dance by using mod_timer_pending() which only modifies the timer if its pending (and which exists since Linux v2.6.30) Note that this was the only place we ever took a ref on frag_queue since Eric's conversion to RCU. So we could potentially replace the whole refcnt field with an atomic flag and a bit more RCU. Fixes: 1da177e ("Linux-2.6.12-rc2") Reviewed-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20251207010942.1672972-2-kuba@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 2f6e056 commit 8ef522c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

net/ipv4/inet_fragment.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,9 @@ static struct inet_frag_queue *inet_frag_alloc(struct fqdir *fqdir,
327327

328328
timer_setup(&q->timer, f->frag_expire, 0);
329329
spin_lock_init(&q->lock);
330-
/* One reference for the timer, one for the hash table. */
330+
/* One reference for the timer, one for the hash table.
331+
* We never take any extra references, only decrement this field.
332+
*/
331333
refcount_set(&q->refcnt, 2);
332334

333335
return q;

net/ipv4/ip_fragment.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,8 @@ static int ip_frag_reinit(struct ipq *qp)
242242
{
243243
unsigned int sum_truesize = 0;
244244

245-
if (!mod_timer(&qp->q.timer, jiffies + qp->q.fqdir->timeout)) {
246-
refcount_inc(&qp->q.refcnt);
245+
if (!mod_timer_pending(&qp->q.timer, jiffies + qp->q.fqdir->timeout))
247246
return -ETIMEDOUT;
248-
}
249247

250248
sum_truesize = inet_frag_rbtree_purge(&qp->q.rb_fragments,
251249
SKB_DROP_REASON_FRAG_TOO_FAR);

0 commit comments

Comments
 (0)