Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754846AbZGVKNa (ORCPT ); Wed, 22 Jul 2009 06:13:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754679AbZGVKN2 (ORCPT ); Wed, 22 Jul 2009 06:13:28 -0400 Received: from smtp161.dfw.emailsrvr.com ([67.192.241.161]:57001 "EHLO smtp161.dfw.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754614AbZGVKKx (ORCPT ); Wed, 22 Jul 2009 06:10:53 -0400 From: Oren Laadan To: Andrew Morton Cc: Linus Torvalds , containers@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-api@vger.kernel.org, Serge Hallyn , Dave Hansen , Ingo Molnar , "H. Peter Anvin" , Alexander Viro , Pavel Emelyanov , Alexey Dobriyan Subject: [RFC v17][PATCH 59/60] c/r: restore file->f_cred Date: Wed, 22 Jul 2009 06:00:21 -0400 Message-Id: <1248256822-23416-60-git-send-email-orenl@librato.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1248256822-23416-1-git-send-email-orenl@librato.com> References: <1248256822-23416-1-git-send-email-orenl@librato.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2176 Lines: 67 From: Serge E. Hallyn 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 c247d44..bcdc774 100644 --- a/checkpoint/files.c +++ b/checkpoint/files.c @@ -150,7 +150,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; } @@ -454,8 +458,16 @@ int restore_file_common(struct ckpt_ctx *ctx, struct file *file, fmode_t new_mode = (__force fmode_t) file->f_mode; fmode_t saved_mode = (__force fmode_t) h->f_mode; 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 ca02d9d..0863a07 100644 --- a/include/linux/checkpoint_hdr.h +++ b/include/linux/checkpoint_hdr.h @@ -329,7 +329,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.0.4 -- 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/