| Message ID | 20241216083703.1859921-1-edumazet@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b9b8301d369b4c876de5255dbf067b19ba88ac71 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: netdevsim: fix nsim_pp_hold_write() | expand |
On Mon, Dec 16, 2024 at 08:37:03AM +0000, Eric Dumazet wrote: > 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>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 16 Dec 2024 08:37:03 +0000 you wrote: > 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> > > [...] Here is the summary with links: - [net] net: netdevsim: fix nsim_pp_hold_write() https://git.kernel.org/netdev/net/c/b9b8301d369b You are awesome, thank you!
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 0be47fed4efc5664c436c91669de5d7c13ef3411..e068a9761c094e91c584d0b29a46166ec31f42d5 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -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 = {
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> --- drivers/net/netdevsim/netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)