Re: [Keyrings] [PATCH] KEYS: Allow special keyrings to be cleared

[Trond Myklebust <Trond.Myklebust@netapp.com>]

On Fri, 2011-11-18 at 09:36 -0500, Steve Dickson wrote: 
> Hey Trond,
> 
> Could you please add this patch to David's patch set?

David's patchset is not going upstream through my tree; I believe it is
supposed to be merged via the security tree.

That said, you might want to fix up the changelog entry. Something seems
to be amiss in the second sentence.

Cheers
  Trond

> Author: Steve Dickson <steved@redhat.com>
> Date:   Fri Nov 18 09:29:17 2011 -0500
> 
>     KEYS: allow keys to be revoked from the keyring
>     
>     To aid in cleaning up invalid id mappings add
>     the write bit to the key permission. Allowing
>     only root will be able to revoke the keys.
>     
>     Signed-off-by: Steve Dickson <steved@redhat.com>
> 
> diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
> index 47d1c6f..652238c 100644
> --- a/fs/nfs/idmap.c
> +++ b/fs/nfs/idmap.c
> @@ -185,7 +185,7 @@ static ssize_t nfs_idmap_request_key(const char *name, size_t nam
>         }
>  
>         rcu_read_lock();
> -       rkey->perm |= KEY_USR_VIEW;
> +       rkey->perm |= KEY_USR_VIEW|KEY_USR_WRITE;
>  
>         ret = key_validate(rkey);
>         if (ret < 0)
> 

-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com