commit 47345b4264bc394a8d16bb16e8e7744965fa3934 Author: Greg Kroah-Hartman Date: Mon Jan 15 18:57:06 2024 +0100 Linux 6.6.12 Link: https://lore.kernel.org/r/20240113094204.275569789@linuxfoundation.org Tested-by: Salvatore Bonaccorso Tested-by: Takeshi Ogasawara Tested-by: Luna Jernberg Tested-by: SeongJae Park Tested-by: Bagas Sanjaya Tested-by: Ricardo B. Marliere Tested-by: Ron Economos Tested-by: Linux Kernel Functional Testing Tested-by: Jon Hunter Tested-by: kernelci.org bot Tested-by: Conor Dooley Tested-by: Harshit Mogalapalli Signed-off-by: Greg Kroah-Hartman commit edbc5613957936dd6ca54a74e129ce9aa7442f82 Author: Jeff Layton Date: Wed Jan 3 08:36:52 2024 -0500 nfsd: drop the nfsd_put helper commit 64e6304169f1e1f078e7f0798033f80a7fb0ea46 upstream. It's not safe to call nfsd_put once nfsd_last_thread has been called, as that function will zero out the nn->nfsd_serv pointer. Drop the nfsd_put helper altogether and open-code the svc_put in its callers instead. That allows us to not be reliant on the value of that pointer when handling an error. Fixes: 2a501f55cd64 ("nfsd: call nfsd_last_thread() before final nfsd_put()") Reported-by: Zhi Li Cc: NeilBrown Signed-off-by: Jeffrey Layton Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman