linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Josef 'Jeff' Sipek" <jsipek@cs.sunysb.edu>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: akpm@linux-foundation.org, Erez Zadok <ezk@cs.sunysb.edu>,
	"Josef 'Jeff' Sipek" <jsipek@cs.sunysb.edu>
Subject: [PATCH 16/21] Unionfs: Disallow setting leftmost branch to readonly
Date: Wed, 23 May 2007 20:36:06 -0400	[thread overview]
Message-ID: <11799669732839-git-send-email-jsipek@cs.sunysb.edu> (raw)
In-Reply-To: <11799669712090-git-send-email-jsipek@cs.sunysb.edu>

From: Erez Zadok <ezk@cs.sunysb.edu>

Unionfs requires the leftmost branch to be writeable for copyup to work
properly and simply.  If, through branch-management commands (add, delete,
or mode change), the leftmost branch will becomes readonly, then return an
error (and tell the user to use "remount,ro" if they want a readonly union).

[jsipek: fixed up to apply cleanly]
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Josef 'Jeff' Sipek <jsipek@cs.sunysb.edu>
---
 fs/unionfs/super.c |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fs/unionfs/super.c b/fs/unionfs/super.c
index 3dee863..446faf8 100644
--- a/fs/unionfs/super.c
+++ b/fs/unionfs/super.c
@@ -629,12 +629,20 @@ static int unionfs_remount_fs(struct super_block *sb, int *flags,
 out_no_change:
 
 	/******************************************************************
-	 * WE'RE ALMOST DONE: see if we need to allocate a small-sized new
-	 * vector, copy the vectors to their correct place, release the
-	 * refcnt of the older ones, and return.
-	 * Also handle invalidating any pages that will have to be re-read.
+	 * WE'RE ALMOST DONE: check if leftmost branch might be read-only,
+	 * see if we need to allocate a small-sized new vector, copy the
+	 * vectors to their correct place, release the refcnt of the older
+	 * ones, and return.  Also handle invalidating any pages that will
+	 * have to be re-read.
 	 *******************************************************************/
 
+	if (!(tmp_data[0].branchperms & MAY_WRITE)) {
+		printk("unionfs: leftmost branch cannot be read-only "
+		       "(use \"remount,ro\" to create a read-only union)\n");
+		err = -EINVAL;
+		goto out_release;
+	}
+
 	/* (re)allocate space for new pointers to hidden dentry */
 	size = new_branches * sizeof(struct unionfs_data);
 	new_data = krealloc(tmp_data, size, GFP_KERNEL);
-- 
1.5.2.rc1.165.gaf9b


  parent reply	other threads:[~2007-05-24  0:36 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-24  0:35 [GIT PULL -mm] Unionfs cleanups and fixes Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 01/21] Unionfs: Tiny documentation fixups Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 02/21] Unionfs: Coding style fixes Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 03/21] Unionfs: Every printk should prefix with "unionfs: " consistently Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 04/21] Unionfs: Add missing copyright notices Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 05/21] Unionfs: Cleanup of strings and comments Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 06/21] Unionfs: Added numerous comments Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 07/21] Unionfs: Consistent pointer declaration spacing Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 08/21] Unionfs: Rename Unionfs's double_lock_dentry to avoid confusion Josef 'Jeff' Sipek
2007-05-24  0:35 ` [PATCH 09/21] Unionfs: Rename our "do_rename" to __unionfs_rename Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 10/21] Unionfs: Move unionfs_query_file to commonfops.c Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 11/21] Unionfs: Combine unionfs_write with __unionfs_write Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 12/21] Unionfs: Prefix external functions with 'extern' properly Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 13/21] Unionfs: Don't leak resources when copyup fails partially Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 14/21] Unionfs: Call realloc unconditionally Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 15/21] Unionfs: Use krealloc instead of open-coding the functionality Josef 'Jeff' Sipek
2007-05-24  0:36 ` Josef 'Jeff' Sipek [this message]
2007-05-24  0:36 ` [PATCH 17/21] Unionfs: Documentation update regarding overlapping branches and new lookup code Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 18/21] Unionfs: Remove defunct unionfs_put_inode super op Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 19/21] Unionfs: Actually catch bad use of unionfs_mnt{get,put} Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 20/21] Unionfs: Removed a trailing whitespace Josef 'Jeff' Sipek
2007-05-24  0:36 ` [PATCH 21/21] Unionfs: Correctly decrement refcounts of mnt's upon branch management Josef 'Jeff' Sipek

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=11799669732839-git-send-email-jsipek@cs.sunysb.edu \
    --to=jsipek@cs.sunysb.edu \
    --cc=akpm@linux-foundation.org \
    --cc=ezk@cs.sunysb.edu \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /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).