mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 01:24:47 +01:00
net/sched: act_mirred: Fix leak when redirecting to self on egress
Whenever a mirred redirect to self on egress happens, mirred allocates a
new skb (skb_to_send). The loop to self check was done after that
allocation, but was not freeing the newly allocated skb, causing a leak.
Fix this by moving the if-statement to before the allocation of the new
skb.
The issue was found by running the accompanying tdc test in 2/2
with config kmemleak enabled.
After a few minutes the kmemleak thread ran and reported the leak coming from
mirred.
Fixes: 1d856251a0 ("net/sched: act_mirred: fix loop detection")
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Link: https://patch.msgid.link/20260101135608.253079-2-jhs@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
d96bfb6867
commit
9892353726
1 changed files with 13 additions and 13 deletions
|
|
@ -266,21 +266,9 @@ static int tcf_mirred_to_dev(struct sk_buff *skb, struct tcf_mirred *m,
|
|||
goto err_cant_do;
|
||||
}
|
||||
|
||||
/* we could easily avoid the clone only if called by ingress and clsact;
|
||||
* since we can't easily detect the clsact caller, skip clone only for
|
||||
* ingress - that covers the TC S/W datapath.
|
||||
*/
|
||||
at_ingress = skb_at_tc_ingress(skb);
|
||||
dont_clone = skb_at_tc_ingress(skb) && is_redirect &&
|
||||
tcf_mirred_can_reinsert(retval);
|
||||
if (!dont_clone) {
|
||||
skb_to_send = skb_clone(skb, GFP_ATOMIC);
|
||||
if (!skb_to_send)
|
||||
goto err_cant_do;
|
||||
}
|
||||
|
||||
want_ingress = tcf_mirred_act_wants_ingress(m_eaction);
|
||||
|
||||
at_ingress = skb_at_tc_ingress(skb);
|
||||
if (dev == skb->dev && want_ingress == at_ingress) {
|
||||
pr_notice_once("tc mirred: Loop (%s:%s --> %s:%s)\n",
|
||||
netdev_name(skb->dev),
|
||||
|
|
@ -290,6 +278,18 @@ static int tcf_mirred_to_dev(struct sk_buff *skb, struct tcf_mirred *m,
|
|||
goto err_cant_do;
|
||||
}
|
||||
|
||||
/* we could easily avoid the clone only if called by ingress and clsact;
|
||||
* since we can't easily detect the clsact caller, skip clone only for
|
||||
* ingress - that covers the TC S/W datapath.
|
||||
*/
|
||||
dont_clone = skb_at_tc_ingress(skb) && is_redirect &&
|
||||
tcf_mirred_can_reinsert(retval);
|
||||
if (!dont_clone) {
|
||||
skb_to_send = skb_clone(skb, GFP_ATOMIC);
|
||||
if (!skb_to_send)
|
||||
goto err_cant_do;
|
||||
}
|
||||
|
||||
/* All mirred/redirected skbs should clear previous ct info */
|
||||
nf_reset_ct(skb_to_send);
|
||||
if (want_ingress && !at_ingress) /* drop dst for egress -> ingress */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue