Re: [PATCH] afs: Fix missing/incorrect unlocking of RCU read lock

From: Alan Huang
Date: Wed Jan 17 2024 - 12:17:33 EST



> 2024年1月18日 00:14,David Howells <dhowells@xxxxxxxxxx> 写道:
>
> In afs_proc_addr_prefs_show(), we need to unlock the RCU read lock in both
> places before returning (and not lock it again).
>
> Fixes: f94f70d39cc2 ("afs: Provide a way to configure address priorities")
> Reported-by: Marc Dionne <marc.dionne@xxxxxxxxxxxx>
> Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
> cc: linux-afs@xxxxxxxxxxxxxxxxxxx
> cc: linux-fsdevel@xxxxxxxxxxxxxxx
> ---
> fs/afs/proc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/fs/afs/proc.c b/fs/afs/proc.c
> index 3bd02571f30d..15eab053af6d 100644
> --- a/fs/afs/proc.c
> +++ b/fs/afs/proc.c
> @@ -166,7 +166,7 @@ static int afs_proc_addr_prefs_show(struct seq_file *m, void *v)
>
> if (!preflist) {
> seq_puts(m, "NO PREFS\n");
> - return 0;
> + goto out;
> }
>
> seq_printf(m, "PROT SUBNET PRIOR (v=%u n=%u/%u/%u)\n",
> @@ -191,7 +191,8 @@ static int afs_proc_addr_prefs_show(struct seq_file *m, void *v)
> }
> }
>
> - rcu_read_lock();
> +out:
> + rcu_read_unlock();

What about using:

guard(rcu)();

Thanks,
Alan

> return 0;
> }
>
>