From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Serge E. Hallyn" Subject: [PATCH 08/10] cr: restore file->f_cred Date: Tue, 9 Jun 2009 20:46:16 -0500 Message-ID: <20090610014616.GG5658@us.ibm.com> References: <20090610014412.GA5628@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20090610014412.GA5628-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Linux Containers Cc: David Howells , Alexey Dobriyan , Andrew Morgan List-Id: containers.vger.kernel.org Restore a file's f_cred. This is set to the cred of the task doing the open, so often it will be the same as that of the restarted task. Signed-off-by: Serge E. Hallyn --- checkpoint/files.c | 16 ++++++++++++++-- include/linux/checkpoint_hdr.h | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/checkpoint/files.c b/checkpoint/files.c index 5ca2e6c..5be7d1b 100644 --- a/checkpoint/files.c +++ b/checkpoint/files.c @@ -151,7 +151,11 @@ int checkpoint_file_common(struct ckpt_ctx *ctx, struct file *file, h->f_pos = file->f_pos; h->f_version = file->f_version; - /* FIX: need also file->uid, file->gid, file->f_owner, etc */ + h->f_credref = checkpoint_obj(ctx, file->f_cred, CKPT_OBJ_CRED); + if (h->f_credref < 0) + return h->f_credref; + + /* FIX: need also file->f_owner, etc */ return 0; } @@ -440,8 +444,16 @@ int restore_file_common(struct ckpt_ctx *ctx, struct file *file, struct ckpt_hdr_file *h) { int ret; + struct cred *cred; + + /* FIX: need to restore owner etc */ - /* FIX: need to restore uid, gid, owner etc */ + /* restore the cred */ + cred = ckpt_obj_fetch(ctx, h->f_credref, CKPT_OBJ_CRED); + if (IS_ERR(cred)) + return PTR_ERR(cred); + put_cred(file->f_cred); + file->f_cred = get_cred(cred); /* safe to set 1st arg (fd) to 0, as command is F_SETFL */ ret = vfs_fcntl(0, F_SETFL, h->f_flags & CKPT_SETFL_MASK, file); diff --git a/include/linux/checkpoint_hdr.h b/include/linux/checkpoint_hdr.h index 02f874e..1a4033c 100644 --- a/include/linux/checkpoint_hdr.h +++ b/include/linux/checkpoint_hdr.h @@ -306,7 +306,7 @@ struct ckpt_hdr_file { __u32 f_type; __u32 f_mode; __u32 f_flags; - __u32 _padding; + __s32 f_credref; __u64 f_pos; __u64 f_version; } __attribute__((aligned(8))); -- 1.6.1