net: pktgen: keep device lookup under RCU protection
Subsystems (3)
PATCH 1/1 net: pktgen: keep device lookup under RCU protection
pktgen_find_dev() releases its RCU read-side critical section before returning pkt_dev. __pktgen_NN_threads() then sets removal_mark through that unprotected pointer.
The worker can concurrently remove the device and queue it for RCU freeing:
CPU 0 (netdevice unregister) CPU 1 (kpktgend)
rcu_read_lock()
find pkt_dev
rcu_read_unlock()
list_del_rcu(&pkt_dev->list) kfree_rcu(pkt_dev, rcu) RCU grace period ends
pkt_dev->removal_mark = 1
The mutex held by CPU 0 does not cover the worker and does not delay an RCU grace period, so the final write can access freed memory. KASAN reported:
BUG: KASAN: slab-use-after-free in __pktgen_NN_threads+0x241/0x280 Write of size 4 at addr ffff88810dab804c Call Trace: __pktgen_NN_threads+0x241/0x280 pktgen_device_event+0x24e/0x3d0 unregister_netdevice_many_notify+0xde8/0x1ec0 rtnl_dellink+0x35d/0xa90 Allocated by task 92: __kasan_kmalloc+0x8f/0xa0 pktgen_thread_write+0x498/0x14e0 Freed by task 0: __kasan_slab_free+0x43/0x70 rcu_core+0x50a/0x1850
Move the existing RCU read lock into the sole caller and release it only after setting removal_mark. The object therefore remains alive through the dereference, while lookup order and control handling remain unchanged.
--- net/core/pktgen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/core/pktgen.c +4 -3
@@ -2032,14 +2032,17 @@ static struct pktgen_dev *__pktgen_NN_threads(const struct pktgen_net *pn,bool exact = (remove ==FIND );list_for_each_entry (t, &pn->pktgen_threads, th_list) { +rcu_read_lock (); pkt_dev =pktgen_find_dev (t, ifname, exact);if (pkt_dev) {if (remove) { pkt_dev->removal_mark =1 ; t->control |=T_REMDEV ; } -break ; } +rcu_read_unlock (); +if (pkt_dev) +break ; }return pkt_dev; }
@@ -3776,7 +3779,6 @@ static struct pktgen_dev *pktgen_find_dev(struct pktgen_thread *t,struct pktgen_dev *p, *pkt_dev =NULL ;size_t len =strlen (ifname); -rcu_read_lock ();list_for_each_entry_rcu (p, &t->if_list, list)if (strncmp (p->odevname, ifname, len) ==0 ) {if (p->odevname[len]) {
@@ -3787,7 +3789,6 @@ static struct pktgen_dev *pktgen_find_dev(struct pktgen_thread *t,break ; } -rcu_read_unlock ();pr_debug ("find_dev(%s) returning %p\n" , ifname, pkt_dev);return pkt_dev; }
Signature · 1 line
2.43.0
Quoted 40 lines · Chengfeng Ye
pktgen_find_dev()releases its RCU read-side critical section before returningpkt_dev.__pktgen_NN_threads()then setsremoval_markthrough that unprotected pointer.The worker can concurrently remove the device and queue it for RCU freeing:
CPU 0 (netdevice unregister) CPU 1 (kpktgend)
rcu_read_lock()
findpkt_dev
rcu_read_unlock()
list_del_rcu(&pkt_dev->list)kfree_rcu(pkt_dev, rcu)RCU grace period ends
pkt_dev->removal_mark= 1The mutex held by CPU 0 does not cover the worker and does not delay an RCU grace period, so the final write can access freed memory. KASAN reported:
BUG: KASAN: slab-use-after-free in __pktgen_NN_threads+0x241/0x280 Write of size 4 at addr ffff88810dab804c Call Trace: __pktgen_NN_threads+0x241/0x280 pktgen_device_event+0x24e/0x3d0 unregister_netdevice_many_notify+0xde8/0x1ec0 rtnl_dellink+0x35d/0xa90 Allocated by task 92: __kasan_kmalloc+0x8f/0xa0 pktgen_thread_write+0x498/0x14e0 Freed by task 0: __kasan_slab_free+0x43/0x70 rcu_core+0x50a/0x1850Move the existing RCU read lock into the sole caller and release it only after setting
removal_mark. The object therefore remains alive through the dereference, while lookup order and control handling remain unchanged.
Quoted 4 lines
Fixes 8788370a1d4b ("pktgen: RCU-ify "if_list" to remove lock in next_to_run()")Signed-off-by Chengfeng Ye <[email protected]>---
Paolo Abeni
maintainerQuoted 58 lines · Chengfeng Ye
pktgen_find_dev()releases its RCU read-side critical section before returningpkt_dev.__pktgen_NN_threads()then setsremoval_markthrough that unprotected pointer.The worker can concurrently remove the device and queue it for RCU freeing:
CPU 0 (netdevice unregister) CPU 1 (kpktgend)
rcu_read_lock()
findpkt_dev
rcu_read_unlock()
list_del_rcu(&pkt_dev->list)kfree_rcu(pkt_dev, rcu)RCU grace period ends
pkt_dev->removal_mark= 1The mutex held by CPU 0 does not cover the worker and does not delay an RCU grace period, so the final write can access freed memory. KASAN reported:
BUG: KASAN: slab-use-after-free in __pktgen_NN_threads+0x241/0x280 Write of size 4 at addr ffff88810dab804c Call Trace: __pktgen_NN_threads+0x241/0x280 pktgen_device_event+0x24e/0x3d0 unregister_netdevice_many_notify+0xde8/0x1ec0 rtnl_dellink+0x35d/0xa90 Allocated by task 92: __kasan_kmalloc+0x8f/0xa0 pktgen_thread_write+0x498/0x14e0 Freed by task 0: __kasan_slab_free+0x43/0x70 rcu_core+0x50a/0x1850Move the existing RCU read lock into the sole caller and release it only after setting
removal_mark. The object therefore remains alive through the dereference, while lookup order and control handling remain unchanged.Fixes 8788370a1d4b ("pktgen: RCU-ify "if_list" to remove lock in next_to_run()")Signed-off-by Chengfeng Ye <[email protected]>--- net/core/pktgen.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)net/core/pktgen.c +1
-0@@ -2032,14 +2032,17 @@ static struct pktgen_dev *__pktgen_NN_threads(const struct pktgen_net *pn,bool exact = (remove ==FIND );list_for_each_entry (t, &pn->pktgen_threads, th_list) { +rcu_read_lock (); pkt_dev =pktgen_find_dev (t, ifname, exact);if (pkt_dev) {if (remove) {
net/core/pktgen.c static struct pktgen_dev *__pktgen_NN_threads(const struct pktgen_net *pn, · line 2047
Quoted 10 lines
net/core/pktgen.c +3
-1pkt_dev->removal_mark =1 ; t->control |=T_REMDEV ; } -break ; } +rcu_read_unlock (); +if (pkt_dev) +break ; }return pkt_dev;
Side note: returning the RCU protected ptr outside the RCU read lock safe, as the caller never deference it, but quite confusing.
It would be nice to follow-up on net-next replacing the return type here with a bool.
/P
Quoted 8 lines · Paolo Abeni
Side note: returning the RCU protected ptr outside the RCU read lock safe, as the caller never deference it, but quite confusing.
It would be nice to follow-up on net-next replacing the return type here with a bool.
/P
No problem, the follow-up patch is just sent.
Best Regards,
Chengfeng
Quoted 8 lines · Chengfeng Ye
Quoted 6 lines · Paolo Abeni
Side note: returning the RCU protected ptr outside the RCU read lock safe, as the caller never deference it, but quite confusing.
It would be nice to follow-up on net-next replacing the return type here with a bool.
Quoted 7 lines
Quoted 2 lines
/P
No problem, the follow-up patch is just sent.
Best Regards,
Chengfeng
Hi Paolo and Eric,
A gentle ping on this fix, which is still marked Deferred.
The requested bool follow-up has been applied to net-next as2a5043c8b7d0 (https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=2a5043c8b7d09f2fc76c19270fd687b774c5a68b),
but the RCU lifetime fix remains outstanding.
I rechecked this original patch against net/main at 8bf659bd54e1: it still applies cleanly.
Best regards,
Chengfeng
PATCH 1/1 net: pktgen: return bool from __pktgen_NN_threads()
In reply to Chengfeng YeCallers of __pktgen_NN_threads() only check whether a pktgen_dev was found. After the RCU lookup they never dereference the returned pointer, so returning it past rcu_read_unlock() is confusing.
Return bool instead and keep the pktgen_dev pointer local to the RCU critical section.
---
This is a net-next follow-up to
https://lore.kernel.org/netdev/[email protected]/
net/core/pktgen.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
net/core/pktgen.c +7 -10
@@ -2024,11 +2024,11 @@ static const struct proc_ops pktgen_thread_proc_ops = { };/* Think find or remove for NN */ -static struct pktgen_dev *__pktgen_NN_threads (const struct pktgen_net *pn, -const char *ifname,int remove) +static bool __pktgen_NN_threads (const struct pktgen_net *pn, +const char *ifname,int remove) {struct pktgen_thread *t; -struct pktgen_dev *pkt_dev =NULL ; +struct pktgen_dev *pkt_dev;bool exact = (remove ==FIND );list_for_each_entry (t, &pn->pktgen_threads, th_list) {
@@ -2042,9 +2042,9 @@ static struct pktgen_dev *__pktgen_NN_threads(const struct pktgen_net *pn, }rcu_read_unlock ();if (pkt_dev) -break ; +return true; } -return pkt_dev; +return false; }/*
@@ -2052,7 +2052,6 @@ static struct pktgen_dev *__pktgen_NN_threads(const struct pktgen_net *pn,*/ static void pktgen_mark_device (const struct pktgen_net *pn,const char *ifname) { -struct pktgen_dev *pkt_dev =NULL ;const int max_tries =10 , msec_per_try =125 ;int i =0 ;
@@ -2061,8 +2060,7 @@ static void pktgen_mark_device(const struct pktgen_net *pn, const char *ifname)while (1 ) { - pkt_dev =__pktgen_NN_threads (pn, ifname,REMOVE ); -if (pkt_dev ==NULL ) +if (!__pktgen_NN_threads (pn, ifname,REMOVE ))break ;/* success */ mutex_unlock (&pktgen_thread_lock);
@@ -3836,8 +3834,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname)/* We don't allow a device to be on several threads */ - pkt_dev =__pktgen_NN_threads (t->net, ifname,FIND ); -if (pkt_dev) { +if (__pktgen_NN_threads (t->net, ifname,FIND )) {pr_err ("ERROR: interface already used\n" );return -EBUSY ; }
Signature · 1 line
2.43.0
Paolo Abeni
maintainerRe: [PATCH net-next] net: pktgen: return bool from __pktgen_NN_threads()
Quoted 9 lines · Chengfeng Ye
Callers of
__pktgen_NN_threads()only check whether apktgen_devwas found. After the RCU lookup they never dereference the returned pointer, so returning it pastrcu_read_unlock()is confusing.Return bool instead and keep the
pktgen_devpointer local to the RCU critical section.Suggested-by Paolo Abeni <[email protected]>Signed-off-by Chengfeng Ye <[email protected]>
## Form letter - net-next-closed
net-next pull request for v7.3 has already been merged, and therefore the net-next tree is closed for new drivers, features, code refactoring and optimizations. We are currently accepting bug fixes only.
Please repost when net-next reopens after Aug 31st.
RFC patches sent for review only are obviously welcome at any time.
See:
https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#development-cycle
Signature · 2 lines
pw-bot: defer pv-bot: closed
Re: [PATCH net-next] net: pktgen: return bool from __pktgen_NN_threads()
Quoted 19 lines · Paolo Abeni
Quoted 9 lines · Chengfeng Ye
Callers of
__pktgen_NN_threads()only check whether apktgen_devwas found. After the RCU lookup they never dereference the returned pointer, so returning it pastrcu_read_unlock()is confusing.Return bool instead and keep the
pktgen_devpointer local to the RCU critical section.Suggested-by Paolo Abeni <[email protected]>Signed-off-by Chengfeng Ye <[email protected]>## Form letter - net-next-closed
net-next pull request for v7.3 has already been merged, and therefore the net-next tree is closed for new drivers, features, code refactoring and optimizations. We are currently accepting bug fixes only.
Please repost when net-next reopens after Aug 31st.
Quoted 8 lines
RFC patches sent for review only are obviously welcome at any time.
See:
https://www.kernel.org/doc/html/next/process/maintainer-netdev.html#development-cycle
--
pw-bot: defer
pv-bot: closed
Hi Paolo,
Sorry for the late reply. I have reposted the boolean-return cleanup as v2, rebased directly onto net-next.
https://lore.kernel.org/r/[email protected]/
The original UAF fix still applies cleanly to net and has Eric’s Reviewed-by. Could it be picked up from the existing submission, or would you prefer a resend?
https://lore.kernel.org/r/[email protected]/
Best regards,
Chengfeng