2017-11-06 13:46:08

by Vasily Averin

Subject: [PATCH] nfsd: use nfs->ns.inum as net ID

Publishing of net pointer is not safe,
let's use nfs->ns.inum instead

Signed-off-by: Vasily Averin <[email protected]>
---
fs/nfsd/nfs4state.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 0c04f81..e0bb0c6 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -7006,8 +7006,8 @@ nfs4_state_start_net(struct net *net)
nn->nfsd4_manager.block_opens = true;
locks_start_grace(net, &nn->nfsd4_manager);
nfsd4_client_tracking_init(net);
- printk(KERN_INFO "NFSD: starting %ld-second grace period (net %p)\n",
- nn->nfsd4_grace, net);
+ printk(KERN_INFO "NFSD: starting %ld-second grace period (net %x)\n",
+ nn->nfsd4_grace, net->ns.inum);
queue_delayed_work(laundry_wq, &nn->laundromat_work, nn->nfsd4_grace * HZ);
return 0;
}
--
2.7.4

2017-11-06 14:51:25

by J. Bruce Fields

Subject: Re: [PATCH] nfsd: use nfs->ns.inum as net ID

Thanks, applying for 4.15.--b.

On Mon, Nov 06, 2017 at 04:46:04PM +0300, Vasily Averin wrote:
> Publishing of net pointer is not safe,
> let's use nfs->ns.inum instead
>
> Signed-off-by: Vasily Averin <[email protected]>
> ---
> fs/nfsd/nfs4state.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 0c04f81..e0bb0c6 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -7006,8 +7006,8 @@ nfs4_state_start_net(struct net *net)
> nn->nfsd4_manager.block_opens = true;
> locks_start_grace(net, &nn->nfsd4_manager);
> nfsd4_client_tracking_init(net);
> - printk(KERN_INFO "NFSD: starting %ld-second grace period (net %p)\n",
> - nn->nfsd4_grace, net);
> + printk(KERN_INFO "NFSD: starting %ld-second grace period (net %x)\n",
> + nn->nfsd4_grace, net->ns.inum);
> queue_delayed_work(laundry_wq, &nn->laundromat_work, nn->nfsd4_grace * HZ);
> return 0;
> }
> --
> 2.7.4