Re: [PATCH] KEYS: Fix an RCU warning

[Eric Dumazet <eric.dumazet@gmail.com>]

Le mercredi 07 avril 2010 à 15:14 +0100, David Howells a écrit :
> Fix the following RCU warning:

> 
> Signed-off-by: David Howells <dhowells@redhat.com>
> ---
> 
>  security/keys/request_key.c |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/security/keys/request_key.c b/security/keys/request_key.c
> index 03fe63e..544e932 100644
> --- a/security/keys/request_key.c
> +++ b/security/keys/request_key.c
> @@ -112,10 +112,13 @@ static int call_sbin_request_key(struct key_construction *cons,
>  	if (cred->tgcred->process_keyring)
>  		prkey = cred->tgcred->process_keyring->serial;
>  
> -	if (cred->tgcred->session_keyring)
> +	if (cred->tgcred->session_keyring) {
> +		rcu_read_lock();
>  		sskey = rcu_dereference(cred->tgcred->session_keyring)->serial;
> -	else
> +		rcu_read_unlock();
> +	} else {
>  		sskey = cred->user->session_keyring->serial;
> +	}
>  
>  	sprintf(keyring_str[2], "%d", sskey);
>  

This fix is really wrong David.



You should instead do :

rcu_read_lock();
skeyring = rcu_dereference(cred->tgcred->session_keyring);
if (skeyring)
	sskey = sskeyring->serial;
else
	sskey = cred->user->session_keyring->serial;
rcu_read_unlock();