Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756816AbYLDGfX (ORCPT ); Thu, 4 Dec 2008 01:35:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754368AbYLDGfJ (ORCPT ); Thu, 4 Dec 2008 01:35:09 -0500 Received: from tundra.namei.org ([65.99.196.166]:49916 "EHLO tundra.namei.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751073AbYLDGfI (ORCPT ); Thu, 4 Dec 2008 01:35:08 -0500 Date: Thu, 4 Dec 2008 17:33:39 +1100 (EST) From: James Morris To: linux-kernel@vger.kernel.org cc: Stephen Rothwell , David Howells , "J. Bruce Fields" Subject: Conflict resolved in the security-testing tree Message-ID: User-Agent: Alpine 1.10 (LRH 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1073 Lines: 37 I resolved a conflict between the new creds API and the nfs4 server code in git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next per the patch below. Please check. diff --cc fs/nfsd/nfs4recover.c index 9371ea1,b79ec93..0000000 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@@ -230,12 -224,10 +230,13 @@@ nfsd4_list_rec_dir(struct dentry *dir, if (!rec_dir_init) return 0; - nfs4_save_user(&uid, &gid); + status = nfs4_save_creds(&original_cred); + if (status < 0) + return status; + INIT_LIST_HEAD(dentries); - filp = dentry_open(dget(dir), mntget(rec_dir.mnt), O_RDONLY); + filp = dentry_open(dget(dir), mntget(rec_dir.mnt), O_RDONLY, + current_cred()); status = PTR_ERR(filp); if (IS_ERR(filp)) goto out; -- James Morris -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/