On Tue, Nov 25, 2008 at 07:11:37PM +1100, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the security-testing tree got a conflict in
> fs/nfsd/nfs4recover.c between commit
> e4625eb826de4f6774ee602c442ba23b686bdcc7 ("nfsd: use of unitialized list
> head on error exit in nfs4recover.c") from the nfsd tree and commit
> d84f4f992cbd76e8f39c488cf0c5d123843923b1 ("CRED: Inaugurate COW
> credentials") from the security-testing tree.
>
> Just a context change. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks!--b.
> --
> Cheers,
> Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc fs/nfsd/nfs4recover.c
> index cf94563,9371ea1..0000000
> --- a/fs/nfsd/nfs4recover.c
> +++ b/fs/nfsd/nfs4recover.c
> @@@ -224,10 -230,12 +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;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
