From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
To: Oren Laadan <orenl@cs.columbia.edu>
Cc: serue@us.ibm.com, Matt Helsley <matthltc@us.ibm.com>,
matthew@wil.cx, <linux-fsdevel@vger.kernel.org>,
Containers <containers@lists.linux-foundation.org>
Subject: [PATCH 4/9][cr][v2]: Restore file_owner info
Date: Tue, 18 May 2010 20:07:27 -0700 [thread overview]
Message-ID: <1274238452-15382-5-git-send-email-sukadev@linux.vnet.ibm.com> (raw)
In-Reply-To: <1274238452-15382-1-git-send-email-sukadev@linux.vnet.ibm.com>
Restore the file-owner information for each 'struct file'. This is
essentially is like a new fcntl(F_SETOWN) and fcntl(F_SETSIG) calls,
except that the pid, uid, euid and signum values are read from the
checkpoint image.
Changelog[v2]:
- [Matt Helsley, Serge Hallyn]: Don't trust uids in checkpoint image.
(added CAP_KILL check)
- Check that signal number read from the checkpoint image is valid.
(not sure it is required, since its an incomplete check for tampering)
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
fs/checkpoint.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/fs/checkpoint.c b/fs/checkpoint.c
index 0fa4ce8..e82f4f1 100644
--- a/fs/checkpoint.c
+++ b/fs/checkpoint.c
@@ -615,6 +615,57 @@ static int attach_file(struct file *file)
return fd;
}
+static int restore_file_owner(struct ckpt_ctx *ctx, struct ckpt_hdr_file *h,
+ struct file *file)
+{
+ int ret;
+ struct pid *pid;
+ uid_t uid, euid;
+
+ uid = h->f_owner_uid;
+ euid = h->f_owner_euid;
+
+ ckpt_debug("restore_file_owner(): uid %u, euid %u, pid %d, type %d\n",
+ uid, euid, h->f_owner_pid, h->f_owner_pid_type);
+ /*
+ * We can't trust the uids in the checkpoint image and normally need
+ * CAP_KILL. But if the uids match our ids, should be fine since we
+ * have access to the file.
+ *
+ * TODO: Move this check to __f_setown() ?
+ */
+ ret = -EACCES;
+ if (!capable(CAP_KILL) &&
+ (uid != current_uid() || euid != current_euid())) {
+ ckpt_err(ctx, ret, "image uids [%d, %d] don't match current "
+ "process uids [%d, %d] and no CAP_KILL\n",
+ uid, euid, current_uid(), current_euid());
+ return ret;
+ }
+
+ ret = -EINVAL;
+ if (!valid_signal(h->f_owner_signum)) {
+ ckpt_err(ctx, ret, "Invalid signum %d\n", h->f_owner_signum);
+ return ret;
+ }
+ file->f_owner.signum = h->f_owner_signum;
+
+ rcu_read_lock();
+ pid = find_vpid(h->f_owner_pid);
+ /*
+ * TODO: Do we need to force==1 or can it be 0 ? 'force' is used to
+ * modify the owner, if one is already set. Can it be set when
+ * we restart an application ?
+ */
+ ret = __f_setown(file, pid, h->f_owner_pid_type, uid, euid, 1);
+ rcu_read_unlock();
+
+ if (ret < 0)
+ ckpt_err(ctx, ret, "__fsetown_uid() failed\n");
+
+ return ret;
+}
+
#define CKPT_SETFL_MASK \
(O_APPEND | O_NONBLOCK | O_NDELAY | FASYNC | O_DIRECT | O_NOATIME)
@@ -648,6 +699,10 @@ int restore_file_common(struct ckpt_ctx *ctx, struct file *file,
if (ret < 0)
return ret;
+ ret = restore_file_owner(ctx, h, file);
+ if (ret < 0)
+ return ret;
+
/*
* Normally f_mode is set by open, and modified only via
* fcntl(), so its value now should match that at checkpoint.
--
1.6.0.4
next prev parent reply other threads:[~2010-05-19 3:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-19 3:07 [PATCH 0/9][cr][v2]: C/R file owner and posix file locks Sukadev Bhattiprolu
2010-05-19 3:07 ` [PATCH 1/9][cr][v2]: Add uid, euid params to f_modown() Sukadev Bhattiprolu
2010-05-19 3:07 ` [PATCH 2/9][cr][v2]: Add uid, euid params to __f_setown() Sukadev Bhattiprolu
2010-05-19 3:07 ` [PATCH 3/9][cr][v2]: Checkpoint file-owner information Sukadev Bhattiprolu
2010-05-19 3:07 ` Sukadev Bhattiprolu [this message]
2010-06-15 4:05 ` [PATCH 4/9][cr][v2]: Restore file_owner info Oren Laadan
2010-07-28 19:25 ` Sukadev Bhattiprolu
2010-07-28 22:20 ` Matt Helsley
2010-07-29 19:00 ` Serge E. Hallyn
2010-05-19 3:07 ` [PATCH 5/9][cr][v2]: Move file_lock macros into linux/fs.h Sukadev Bhattiprolu
2010-05-19 3:07 ` [PATCH 6/9][cr][v2]: Checkpoint file-locks Sukadev Bhattiprolu
2010-06-15 4:13 ` Oren Laadan
2010-07-28 19:26 ` Sukadev Bhattiprolu
[not found] ` <20100728192649.GB14570-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-07-28 19:42 ` Oren Laadan
2010-07-28 21:29 ` Sukadev Bhattiprolu
2010-07-28 23:39 ` Oren Laadan
2010-05-19 3:07 ` [PATCH 7/9][cr][v2]: Define flock_set() Sukadev Bhattiprolu
2010-05-19 3:07 ` [PATCH 8/9][cr][v2]: Define flock64_set() Sukadev Bhattiprolu
2010-05-19 3:07 ` [PATCH 9/9][cr][v2]: Restore file-locks Sukadev Bhattiprolu
2010-05-26 7:48 ` steve
2010-05-26 23:57 ` Sukadev Bhattiprolu
2010-06-15 4:22 ` Oren Laadan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1274238452-15382-5-git-send-email-sukadev@linux.vnet.ibm.com \
--to=sukadev@linux.vnet.ibm.com \
--cc=containers@lists.linux-foundation.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=matthltc@us.ibm.com \
--cc=orenl@cs.columbia.edu \
--cc=serue@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).