From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx2.netapp.com ([216.240.18.37]:52638 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752414Ab1KRSdl convert rfc822-to-8bit (ORCPT ); Fri, 18 Nov 2011 13:33:41 -0500 Message-ID: <1321641219.2653.13.camel@lade.trondhjem.org> Subject: Re: [Keyrings] [PATCH] KEYS: Allow special keyrings to be cleared From: Trond Myklebust To: Steve Dickson Cc: David Howells , jmorris@redhat.com, keyrings@linux-nfs.org, linux-nfs@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Date: Fri, 18 Nov 2011 20:33:39 +0200 In-Reply-To: <4EC66D7B.7030908@RedHat.com> References: <20111111160753.5190.36069.stgit@warthog.procyon.org.uk> <4EC66D7B.7030908@RedHat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org List-ID: 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 > 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 > > 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