]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: netdevsim: fix nsim_pp_hold_write()
authorEric Dumazet <edumazet@google.com>
Mon, 16 Dec 2024 08:37:03 +0000 (08:37 +0000)
committerJakub Kicinski <kuba@kernel.org>
Wed, 18 Dec 2024 01:46:17 +0000 (17:46 -0800)
nsim_pp_hold_write() has two problems:

1) It may return with rtnl held, as found by syzbot.

2) Its return value does not propagate an error if any.

Fixes: 1580cbcbfe77 ("net: netdevsim: add some fake page pool use")
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241216083703.1859921-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/netdevsim/netdev.c

index 0be47fed4efc5664c436c91669de5d7c13ef3411..e068a9761c094e91c584d0b29a46166ec31f42d5 100644 (file)
@@ -635,10 +635,10 @@ nsim_pp_hold_write(struct file *file, const char __user *data,
                page_pool_put_full_page(ns->page->pp, ns->page, false);
                ns->page = NULL;
        }
-       rtnl_unlock();
 
 exit:
-       return count;
+       rtnl_unlock();
+       return ret;
 }
 
 static const struct file_operations nsim_pp_hold_fops = {